diff --git a/osu.Game.Rulesets.Taiko/Edit/Checks/CheckTaikoInconsistentSkipBarLine.cs b/osu.Game.Rulesets.Taiko/Edit/Checks/CheckTaikoInconsistentSkipBarLine.cs
index 3d2e888230..0d12476e30 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Checks/CheckTaikoInconsistentSkipBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Checks/CheckTaikoInconsistentSkipBarLine.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Taiko.Edit.Checks
 {
     public class CheckTaikoInconsistentSkipBarLine : ICheck
     {
-        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Timing, "Inconsistent \"Skip Bar Line\" setting");
+        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Timing, "Inconsistent \"Skip Bar Line\" setting", CheckScope.BeatmapSet);
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckInconsistentMetadata.cs b/osu.Game/Rulesets/Edit/Checks/CheckInconsistentMetadata.cs
index e7f06556cc..d320dae0c9 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckInconsistentMetadata.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckInconsistentMetadata.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             if (difficulties.Count <= 1)
                 yield break;
 
-            var referenceBeatmap = difficulties.OrderByDescending(b => b.BeatmapInfo.StarRating).First();
+            var referenceBeatmap = context.Beatmap;
             var referenceMetadata = referenceBeatmap.Metadata;
 
             // Define metadata fields to check
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckInconsistentTimingControlPoints.cs b/osu.Game/Rulesets/Edit/Checks/CheckInconsistentTimingControlPoints.cs
index 8ed802e618..def1086525 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckInconsistentTimingControlPoints.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckInconsistentTimingControlPoints.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckInconsistentTimingControlPoints : ICheck
     {
-        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Timing, "Inconsistent timing control points");
+        public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Timing, "Inconsistent timing control points", CheckScope.BeatmapSet);
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {