diff --git a/Cavern.QuickEQ.Format/FilterSet/EqualizerAPOEqualizerFilterSet.cs b/Cavern.QuickEQ.Format/FilterSet/EqualizerAPOEqualizerFilterSet.cs
index 46b6432c..371f4680 100644
--- a/Cavern.QuickEQ.Format/FilterSet/EqualizerAPOEqualizerFilterSet.cs
+++ b/Cavern.QuickEQ.Format/FilterSet/EqualizerAPOEqualizerFilterSet.cs
@@ -61,7 +61,7 @@ public override void Export(string path) {
         /// <summary>
         /// Get the short name of a channel written to the configuration file to select that channel for setup.
         /// </summary>
-        protected override string GetLabel(int channel) => channel < 8 ?
+        protected override string GetLabel(int channel) => Channels.Length <= 8 ?
             EqualizerAPOUtils.GetChannelLabel(Channels[channel].reference) : base.GetLabel(channel);
     }
 }
\ No newline at end of file
diff --git a/Cavern/Channels/SpatialRemapping.cs b/Cavern/Channels/SpatialRemapping.cs
index ed0d48b4..f64ff281 100644
--- a/Cavern/Channels/SpatialRemapping.cs
+++ b/Cavern/Channels/SpatialRemapping.cs
@@ -30,7 +30,7 @@ public static float[][] GetMatrix(Channel[] playedContent, Channel[] usedLayout)
             Channel[] oldChannels = Listener.Channels;
             Listener.ReplaceChannels(usedLayout);
             for (int i = 0; i < inputs; i++) {
-                simulator.AttachSource(new Source() {
+                simulator.AttachSource(new Source {
                     Clip = GetClipForChannel(i, inputs, simulator.SampleRate),
                     Position = playedContent[i].SpatialPos * Listener.EnvironmentSize,
                     LFE = playedContent[i].LFE,