diff --git a/osu.Game/Modes/Score.cs b/osu.Game/Modes/Score.cs
index 8a06e8a60b..4effe9affd 100644
--- a/osu.Game/Modes/Score.cs
+++ b/osu.Game/Modes/Score.cs
@@ -10,8 +10,8 @@ namespace osu.Game.Modes
         public double TotalScore { get; set; }
         public double Accuracy { get; set; }
         public double Health { get; set; }
-        public long Combo { get; set; }
-        public long MaxCombo { get; set; }
+        public int MaxCombo { get; set; }
+        public int Combo { get; set; }
 
         public Replay Replay;
         public BeatmapInfo Beatmap;
diff --git a/osu.Game/Modes/ScoreProcesssor.cs b/osu.Game/Modes/ScoreProcesssor.cs
index ffae81fa82..554996c145 100644
--- a/osu.Game/Modes/ScoreProcesssor.cs
+++ b/osu.Game/Modes/ScoreProcesssor.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Modes
 
         public readonly BindableDouble Health = new BindableDouble { MinValue = 0, MaxValue = 1 };
 
-        public readonly BindableLong Combo = new BindableLong();
+        public readonly BindableInt Combo = new BindableInt();
 
         /// <summary>
         /// Are we allowed to fail?
@@ -43,7 +43,7 @@ namespace osu.Game.Modes
         /// Keeps track of the highest combo ever achieved in this play.
         /// This is handled automatically by ScoreProcessor.
         /// </summary>
-        public readonly BindableLong HighestCombo = new BindableLong();
+        public readonly BindableInt HighestCombo = new BindableInt();
 
         public readonly List<JudgementInfo> Judgements;
 
diff --git a/osu.Game/Modes/UI/ComboCounter.cs b/osu.Game/Modes/UI/ComboCounter.cs
index 75d22ed0ad..f831677e44 100644
--- a/osu.Game/Modes/UI/ComboCounter.cs
+++ b/osu.Game/Modes/UI/ComboCounter.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Modes.UI
 {
     public abstract class ComboCounter : Container
     {
-        public BindableLong Current = new BindableLong
+        public BindableInt Current = new BindableInt
         {
             MinValue = 0,
         };
@@ -42,7 +42,7 @@ namespace osu.Game.Modes.UI
 
         protected SpriteText DisplayedCountSpriteText;
 
-        private long previousValue;
+        private int previousValue;
 
         /// <summary>
         /// Base of all combo counters.
@@ -85,11 +85,11 @@ namespace osu.Game.Modes.UI
             StopRolling();
         }
 
-        private long displayedCount;
+        private int displayedCount;
         /// <summary>
         /// Value shown at the current moment.
         /// </summary>
-        public virtual long DisplayedCount
+        public virtual int DisplayedCount
         {
             get { return displayedCount; }
             protected set
@@ -116,7 +116,7 @@ namespace osu.Game.Modes.UI
         /// Increments the combo by an amount.
         /// </summary>
         /// <param name="amount"></param>
-        public void Increment(long amount = 1)
+        public void Increment(int amount = 1)
         {
             Current.Value = Current + amount;
         }
@@ -129,33 +129,33 @@ namespace osu.Game.Modes.UI
             updateCount(false);
         }
 
-        protected virtual string FormatCount(long count)
+        protected virtual string FormatCount(int count)
         {
             return count.ToString();
         }
 
-        protected virtual void OnCountRolling(long currentValue, long newValue)
+        protected virtual void OnCountRolling(int currentValue, int newValue)
         {
             transformRoll(new TransformComboRoll(), currentValue, newValue);
         }
 
-        protected virtual void OnCountIncrement(long currentValue, long newValue)
+        protected virtual void OnCountIncrement(int currentValue, int newValue)
         {
             DisplayedCount = newValue;
         }
 
-        protected virtual void OnCountChange(long currentValue, long newValue)
+        protected virtual void OnCountChange(int currentValue, int newValue)
         {
             DisplayedCount = newValue;
         }
 
-        private double getProportionalDuration(long currentValue, long newValue)
+        private double getProportionalDuration(int currentValue, int newValue)
         {
             double difference = currentValue > newValue ? currentValue - newValue : newValue - currentValue;
             return difference * RollingDuration;
         }
 
-        private void updateDisplayedCount(long currentValue, long newValue, bool rolling)
+        private void updateDisplayedCount(int currentValue, int newValue, bool rolling)
         {
             displayedCount = newValue;
             if (rolling)
@@ -168,7 +168,7 @@ namespace osu.Game.Modes.UI
 
         private void updateCount(bool rolling)
         {
-            long prev = previousValue;
+            int prev = previousValue;
             previousValue = Current;
 
             if (!IsLoaded)
@@ -192,7 +192,7 @@ namespace osu.Game.Modes.UI
             }
         }
 
-        private void transformRoll(TransformComboRoll transform, long currentValue, long newValue)
+        private void transformRoll(TransformComboRoll transform, int currentValue, int newValue)
         {
             Flush(false, typeof(TransformComboRoll));
 
@@ -211,9 +211,9 @@ namespace osu.Game.Modes.UI
             Transforms.Add(transform);
         }
 
-        protected class TransformComboRoll : Transform<long>
+        protected class TransformComboRoll : Transform<int>
         {
-            protected override long CurrentValue
+            protected override int CurrentValue
             {
                 get
                 {
@@ -221,7 +221,7 @@ namespace osu.Game.Modes.UI
                     if (time < StartTime) return StartValue;
                     if (time >= EndTime) return EndValue;
 
-                    return (long)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
+                    return (int)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
                 }
             }
 
@@ -232,8 +232,8 @@ namespace osu.Game.Modes.UI
             }
         }
 
-        protected abstract void OnDisplayedCountRolling(long currentValue, long newValue);
-        protected abstract void OnDisplayedCountIncrement(long newValue);
-        protected abstract void OnDisplayedCountChange(long newValue);
+        protected abstract void OnDisplayedCountRolling(int currentValue, int newValue);
+        protected abstract void OnDisplayedCountIncrement(int newValue);
+        protected abstract void OnDisplayedCountChange(int newValue);
     }
 }
diff --git a/osu.Game/Modes/UI/StandardComboCounter.cs b/osu.Game/Modes/UI/StandardComboCounter.cs
index 86b689fa89..08bb3add84 100644
--- a/osu.Game/Modes/UI/StandardComboCounter.cs
+++ b/osu.Game/Modes/UI/StandardComboCounter.cs
@@ -25,12 +25,12 @@ namespace osu.Game.Modes.UI
             PopOutCount.Anchor = Anchor;
         }
 
-        protected override string FormatCount(long count)
+        protected override string FormatCount(int count)
         {
             return $@"{count}x";
         }
 
-        protected virtual void TransformPopOut(long newValue)
+        protected virtual void TransformPopOut(int newValue)
         {
             PopOutCount.Text = FormatCount(newValue);
 
@@ -43,19 +43,19 @@ namespace osu.Game.Modes.UI
             PopOutCount.MoveTo(DisplayedCountSpriteText.Position, PopOutDuration, PopOutEasing);
         }
 
-        protected virtual void TransformPopOutRolling(long newValue)
+        protected virtual void TransformPopOutRolling(int newValue)
         {
             TransformPopOut(newValue);
             TransformPopOutSmall(newValue);
         }
 
-        protected virtual void TransformNoPopOut(long newValue)
+        protected virtual void TransformNoPopOut(int newValue)
         {
             DisplayedCountSpriteText.Text = FormatCount(newValue);
             DisplayedCountSpriteText.ScaleTo(1);
         }
 
-        protected virtual void TransformPopOutSmall(long newValue)
+        protected virtual void TransformPopOutSmall(int newValue)
         {
             DisplayedCountSpriteText.Text = FormatCount(newValue);
             DisplayedCountSpriteText.ScaleTo(PopOutSmallScale);
@@ -71,7 +71,7 @@ namespace osu.Game.Modes.UI
             DisplayedCount++;
         }
 
-        protected override void OnCountRolling(long currentValue, long newValue)
+        protected override void OnCountRolling(int currentValue, int newValue)
         {
             ScheduledPopOutCurrentId++;
 
@@ -82,7 +82,7 @@ namespace osu.Game.Modes.UI
             base.OnCountRolling(currentValue, newValue);
         }
 
-        protected override void OnCountIncrement(long currentValue, long newValue)
+        protected override void OnCountIncrement(int currentValue, int newValue)
         {
             ScheduledPopOutCurrentId++;
 
@@ -100,7 +100,7 @@ namespace osu.Game.Modes.UI
             }, PopOutDuration);
         }
 
-        protected override void OnCountChange(long currentValue, long newValue)
+        protected override void OnCountChange(int currentValue, int newValue)
         {
             ScheduledPopOutCurrentId++;
 
@@ -110,7 +110,7 @@ namespace osu.Game.Modes.UI
             base.OnCountChange(currentValue, newValue);
         }
 
-        protected override void OnDisplayedCountRolling(long currentValue, long newValue)
+        protected override void OnDisplayedCountRolling(int currentValue, int newValue)
         {
             if (newValue == 0)
                 DisplayedCountSpriteText.FadeOut(FadeOutDuration);
@@ -123,14 +123,14 @@ namespace osu.Game.Modes.UI
                 TransformNoPopOut(newValue);
         }
 
-        protected override void OnDisplayedCountChange(long newValue)
+        protected override void OnDisplayedCountChange(int newValue)
         {
             DisplayedCountSpriteText.FadeTo(newValue == 0 ? 0 : 1);
 
             TransformNoPopOut(newValue);
         }
 
-        protected override void OnDisplayedCountIncrement(long newValue)
+        protected override void OnDisplayedCountIncrement(int newValue)
         {
             DisplayedCountSpriteText.Show();