diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 03f5bc4c6c..433e5fd2a9 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -8,10 +8,7 @@
             "taskName": "build",
             "isShellCommand": true,
             "showOutput": "silent",
-            "command": "xbuild",
-            "windows": {
-                "command": "msbuild"
-            },
+            "command": "msbuild",
             "args": [
                 // Ask msbuild to generate full paths for file names.
                 "/property:GenerateFullPaths=true"
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 9ff77a5f3c..4623fe7f22 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Position = s.Position;
 
             //take up full playfield.
-            Size = OsuPlayfield.BASE_SIZE;
+            Size = new Vector2(OsuPlayfield.BASE_SIZE.X);
 
             spinner = s;
 
diff --git a/osu.Game.Rulesets.Osu/OsuAutoReplay.cs b/osu.Game.Rulesets.Osu/OsuAutoReplay.cs
index ee27a37e76..4e10179819 100644
--- a/osu.Game.Rulesets.Osu/OsuAutoReplay.cs
+++ b/osu.Game.Rulesets.Osu/OsuAutoReplay.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Rulesets.Osu
 
                 ReplayButtonState button = buttonIndex % 2 == 0 ? ReplayButtonState.Left1 : ReplayButtonState.Right1;
 
-                double hEndTime = (h as IHasEndTime)?.EndTime ?? h.StartTime;
+                double hEndTime = ((h as IHasEndTime)?.EndTime ?? h.StartTime) + KEY_UP_DELAY;
 
                 ReplayFrame newFrame = new ReplayFrame(h.StartTime, targetPosition.X, targetPosition.Y, button);
                 ReplayFrame endFrame = new ReplayFrame(hEndTime + endDelay, h.EndPosition.X, h.EndPosition.Y, ReplayButtonState.None);
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs
index b44c789be5..a8187d68ab 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoReplay.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Taiko.Replays
                 else
                     throw new Exception("Unknown hit object type.");
 
-                Frames.Add(new ReplayFrame(endTime + 1, 0, 0, ReplayButtonState.None));
+                Frames.Add(new ReplayFrame(endTime + KEY_UP_DELAY, 0, 0, ReplayButtonState.None));
 
                 if (i < beatmap.HitObjects.Count - 1)
                 {
@@ -113,4 +113,4 @@ namespace osu.Game.Rulesets.Taiko.Replays
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Rulesets/Replays/Replay.cs b/osu.Game/Rulesets/Replays/Replay.cs
index 17e6324d9d..36e1b24e73 100644
--- a/osu.Game/Rulesets/Replays/Replay.cs
+++ b/osu.Game/Rulesets/Replays/Replay.cs
@@ -8,8 +8,10 @@ namespace osu.Game.Rulesets.Replays
 {
     public class Replay
     {
+        protected const double KEY_UP_DELAY = 50;
+
         public User User;
 
         public List<ReplayFrame> Frames = new List<ReplayFrame>();
     }
-}
\ No newline at end of file
+}