diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 66b39648e5..db18f9b444 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private (IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) decodeFromLegacy(Stream stream)
+        private (IBeatmap beatmap, LegacySkin beatmapSkin) decodeFromLegacy(Stream stream)
         {
             using (var reader = new LineBufferedReader(stream))
             {
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
-        private Stream encodeToLegacy((IBeatmap beatmap, LegacyBeatmapSkin beatmapSkin) fullBeatmap)
+        private Stream encodeToLegacy((IBeatmap beatmap, LegacySkin beatmapSkin) fullBeatmap)
         {
             var (beatmap, beatmapSkin) = fullBeatmap;
             var stream = new MemoryStream();
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
index f305d2a15d..0489236d45 100644
--- a/osu.Game/Screens/Edit/EditorChangeHandler.cs
+++ b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -90,9 +90,7 @@ namespace osu.Game.Screens.Edit
             using (var stream = new MemoryStream())
             {
                 using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                {
                     new LegacyBeatmapEncoder(editorBeatmap, beatmapSkin).Encode(sw);
-                }
 
                 savedStates.Add(stream.ToArray());
             }
diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index 4b29111504..a48d713771 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Skinning
             return other != null &&
                    ConfigDictionary.SequenceEqual(other.ConfigDictionary) &&
                    ComboColours.SequenceEqual(other.ComboColours) &&
-                   CustomColours.SequenceEqual(other.CustomColours);
+                   CustomColours?.SequenceEqual(other.CustomColours) == true;
         }
     }
 }