diff --git a/CUETools.Codecs/AudioEncoderSettings.cs b/CUETools.Codecs/AudioEncoderSettings.cs
index 205cb48..c4b1c90 100644
--- a/CUETools.Codecs/AudioEncoderSettings.cs
+++ b/CUETools.Codecs/AudioEncoderSettings.cs
@@ -116,7 +116,7 @@ namespace CUETools.Codecs
                 if (modes.Length == 0 && value < 0)
                     return;
                 if (value < 0 || value >= modes.Length)
-                    throw new InvalidOperationException();
+                    throw new IndexOutOfRangeException();
                 this.EncoderMode = modes[value];
             }
         }
diff --git a/CUETools.Flake/Program.cs b/CUETools.Flake/Program.cs
index 42d1485..858d44a 100644
--- a/CUETools.Flake/Program.cs
+++ b/CUETools.Flake/Program.cs
@@ -147,7 +147,7 @@ namespace CUETools.FlakeExe
             bool do_seektable = true;
             bool buffered = false;
             string coeffs = null;
-            var settings = new FlakeWriterSettings();
+            var settings = new FlakeWriterSettings() { AllowNonSubset = true };
 #if FINETUNE
             int finetune_depth = -1;
 #endif