diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
index 7a5f1105c518..8f2ef7d5c4d1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
@@ -170,7 +170,7 @@ private void checkHyperDashFruitColour(ISkin skin, Colour4 expectedColour)
                 }, skin);
             });
 
-            AddAssert("hyper-dash colour is correct", () => checkLegacyFruitHyperDashColour(drawableFruit, expectedColour));
+            AddUntilStep("hyper-dash colour is correct", () => checkLegacyFruitHyperDashColour(drawableFruit, expectedColour));
         }
 
         private Drawable setupSkinHierarchy(Drawable child, ISkin skin)
@@ -187,7 +187,7 @@ private Drawable setupSkinHierarchy(Drawable child, ISkin skin)
 
         private bool checkLegacyFruitHyperDashColour(DrawableFruit fruit, Colour4 expectedColour) =>
             fruit.ChildrenOfType<SkinnableDrawable>().FirstOrDefault()?.Drawable.ChildrenOfType<Sprite>()
-                 .Any(c => c.Colour == expectedColour) == true;
+                 .Any(c => c.Colour.TopLeft.SRGB == expectedColour) == true;
 
         private class TestSkin : LegacySkin
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSliderVelocityToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/OsuSliderVelocityToolboxGroup.cs
index c8e5bc13d531..1e81a539afc5 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSliderVelocityToolboxGroup.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSliderVelocityToolboxGroup.cs
@@ -14,7 +14,7 @@
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
-using osuTK;
+using System.Numerics;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
diff --git a/osu.Game/Screens/Edit/Components/FormSampleSet.cs b/osu.Game/Screens/Edit/Components/FormSampleSet.cs
index cc01fdd67eb3..38c9d1a4fdd1 100644
--- a/osu.Game/Screens/Edit/Components/FormSampleSet.cs
+++ b/osu.Game/Screens/Edit/Components/FormSampleSet.cs
@@ -274,8 +274,7 @@ private void updateState()
 
                 recycleSamples();
 
-                if (triangles != null)
-                    triangles.Colour = ColourInfo.GradientVertical(triangleGradientSecondColour ?? default, BackgroundColour);
+                triangles?.Colour = ColourInfo.GradientVertical(triangleGradientSecondColour ?? default, BackgroundColour);
             }
 
             private void recycleSamples() => Schedule(() =>
diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs
index ccfce6cab579..a017bc8589ba 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs
@@ -440,8 +440,6 @@ private void onMatchmakingLobbyStatusChanged(MatchmakingLobbyStatus status) => S
             loadRecentMatches(status.RecentMatches.OfType<RankedPlayRoomState>().ToArray()).FireAndForget();
         });
 
-        private int historyInsertOrder;
-
         private async Task loadRecentMatches(RankedPlayRoomState[] matches)
         {
             // matches initial API response.