diff --git a/.vscode/launch.json b/.vscode/launch.json
index b981556649..c836ff97bc 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "preLaunchTask": "build",
             "runtimeExecutable": null,
             "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
         },
         {
             "name": "Launch Desktop",
@@ -23,7 +23,7 @@
             "preLaunchTask": "build",
             "runtimeExecutable": null,
             "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
         },
         {
             "name": "Attach",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 0c0e79f7fb..03f5bc4c6c 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,25 +2,23 @@
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
     "version": "0.1.0",
-    "windows": {
-        "command": "msbuild"
-    },
-    "linux": {
-        "command": "xbuild"
-    },
-    "args": [
-        // Ask msbuild to generate full paths for file names.
-        "/property:GenerateFullPaths=true"
-    ],
     "taskSelector": "/t:",
-    "showOutput": "silent",
     "tasks": [
         {
             "taskName": "build",
-            // Show the output window only if unrecognized errors occur.
+            "isShellCommand": true,
             "showOutput": "silent",
+            "command": "xbuild",
+            "windows": {
+                "command": "msbuild"
+            },
+            "args": [
+                // Ask msbuild to generate full paths for file names.
+                "/property:GenerateFullPaths=true"
+            ],
             // Use the standard MS compiler pattern to detect errors, warnings and infos
-            "problemMatcher": "$msCompile"
+            "problemMatcher": "$msCompile",
+            "isBuildCommand": true
         }
     ]
 }
\ No newline at end of file
diff --git a/osu-framework b/osu-framework
index 45e75163b2..7ac3dbff36 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 45e75163b272b7aa023afec7801ea079aba4ee69
+Subproject commit 7ac3dbff3615fb410da1e330e6379b53a41292b6
diff --git a/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs b/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
index 986240b37f..567c7a35b1 100644
--- a/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
+++ b/osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
@@ -42,14 +42,14 @@ namespace osu.Game.Modes.Osu
             {
                 if (mouseDisabled.Value)
                 {
-                    mouse.PressedButtons.Remove(MouseButton.Left);
-                    mouse.PressedButtons.Remove(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Left, false);
+                    mouse.SetPressed(MouseButton.Right, false);
                 }
 
                 if (leftViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Left);
+                    mouse.SetPressed(MouseButton.Left, true);
                 if (rightViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Right, true);
             }
         }
     }
diff --git a/osu.Game/Modes/Replays/FramedReplayInputHandler.cs b/osu.Game/Modes/Replays/FramedReplayInputHandler.cs
index ae20ece515..0c1e140ce4 100644
--- a/osu.Game/Modes/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Modes/Replays/FramedReplayInputHandler.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Modes.Replays
             public ReplayMouseState(Vector2 position, IEnumerable<MouseButton> list)
             {
                 Position = position;
-                list.ForEach(b => PressedButtons.Add(b));
+                list.ForEach(b => SetPressed(b, true));
             }
         }
 
@@ -148,4 +148,4 @@ namespace osu.Game.Modes.Replays
             }
         }
     }
-}
\ No newline at end of file
+}