diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index 767fb0dffb..aff2903078 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -48,6 +48,7 @@ namespace osu.Desktop.VisualTests.Tests
                 HitObjects = objects,
                 BeatmapInfo = new BeatmapInfo
                 {
+                    BaseDifficulty = new BaseDifficulty(),
                     Metadata = new BeatmapMetadata
                     {
                         Artist = @"Unknown",
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
index 9dfd0ed27b..a117d9d1ca 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
@@ -65,7 +65,7 @@ namespace osu.Desktop.VisualTests.Tests
                             new Vector2(-200, 0),
                             new Vector2(400, 0),
                         },
-                        Length = 400,
+                        Distance = 400,
                         Position = new Vector2(-200, 0),
                         Velocity = 1,
                         TickDistance = 100,
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index 7d770031a4..c79a2517bd 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -68,6 +68,7 @@ namespace osu.Desktop.VisualTests.Tests
                     HitObjects = objects,
                     BeatmapInfo = new BeatmapInfo
                     {
+                        BaseDifficulty = new BaseDifficulty(),
                         Metadata = new BeatmapMetadata
                         {
                             Artist = @"Unknown",
diff --git a/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
index 61e97f1f4d..36966583df 100644
--- a/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
+++ b/osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Modes.Osu.Beatmaps
 
                     NewCombo = comboData?.NewCombo ?? false,
 
-                    Length = distanceData?.Distance ?? 0,
+                    Distance = distanceData?.Distance ?? 0,
 
                     RepeatCount = repeatsData?.RepeatCount ?? 0
                 };
diff --git a/osu.Game.Modes.Osu/Objects/OsuHitObject.cs b/osu.Game.Modes.Osu/Objects/OsuHitObject.cs
index 28e341270c..bec4a863c9 100644
--- a/osu.Game.Modes.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Modes.Osu/Objects/OsuHitObject.cs
@@ -10,7 +10,7 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Modes.Osu.Objects
 {
-    public abstract class OsuHitObject : HitObject, IHasCombo
+    public abstract class OsuHitObject : HitObject, IHasCombo, IHasPosition
     {
         public const double OBJECT_RADIUS = 64;
 
@@ -37,10 +37,8 @@ namespace osu.Game.Modes.Osu.Objects
 
         public abstract HitObjectType Type { get; }
 
-        public virtual bool NewCombo { get; set; }
-
         public Color4 ComboColour { get; set; }
-
+        public virtual bool NewCombo { get; set; }
         public int ComboIndex { get; set; }
 
         public double HitWindowFor(OsuScoreResult result)
diff --git a/osu.Game.Modes.Osu/Objects/Slider.cs b/osu.Game.Modes.Osu/Objects/Slider.cs
index fe17d1e50e..664629bf6d 100644
--- a/osu.Game.Modes.Osu/Objects/Slider.cs
+++ b/osu.Game.Modes.Osu/Objects/Slider.cs
@@ -11,7 +11,7 @@ using System.Collections.Generic;
 
 namespace osu.Game.Modes.Osu.Objects
 {
-    public class Slider : OsuHitObject, IHasEndTime
+    public class Slider : OsuHitObject, IHasEndTime, IHasCurve, IHasDistance, IHasRepeats
     {
         public double EndTime => StartTime + RepeatCount * Curve.Length / Velocity;
         public double Duration => EndTime - StartTime;
@@ -60,7 +60,7 @@ namespace osu.Game.Modes.Osu.Objects
             set { Curve.ControlPoints = value; }
         }
 
-        public double Length
+        public double Distance
         {
             get { return Curve.Length; }
             set { Curve.Length = value; }
@@ -90,7 +90,7 @@ namespace osu.Game.Modes.Osu.Objects
             TickDistance = baseVelocity / baseDifficulty.SliderTickRate;
         }
 
-        public int RepeatCount = 1;
+        public int RepeatCount { get; set; } = 1;
 
         internal readonly SliderCurve Curve = new SliderCurve();