diff --git a/tools/debug.bat b/tools/debug.bat
index 8ed7ae73..6fb8679e 100755
--- a/tools/debug.bat
+++ b/tools/debug.bat
@@ -12,4 +12,4 @@ reg query %RegKey% /v %RegVal% >nul 2>&1 || (echo Cannot find Windows Kit >&2 &
 for /f "tokens=2,*" %%i in ('reg query %RegKey% /v %RegVal% ^| findstr %RegVal%') do (
     set KitRoot="%%j"
 )
-start "winfsp" %KitRoot%\Debuggers\x64\windbg -W %DebugWorkspace% -k net:port=%DebugPort%,key=%DebugKey%
+start "%DebugWorkspace%" %KitRoot%\Debuggers\x64\windbg -W %DebugWorkspace% -k net:port=%DebugPort%,key=%DebugKey%
diff --git a/tools/deploy.bat b/tools/deploy.bat
index 3bd28e6d..76fc5a85 100755
--- a/tools/deploy.bat
+++ b/tools/deploy.bat
@@ -11,6 +11,10 @@ set Chkpnt=winfsp
 if not X%1==X set Target=%1
 if not X%2==X set Chkpnt=%2
 
+(
+    echo regsvr32 /s winfsp-x64.dll
+) > %~dp0..\build\VStudio\build\%Config%\deploy-setup.bat
+
 set Files=
 for %%f in (winfsp-%Suffix%.sys winfsp-%Suffix%.dll winfsp-tests-%Suffix%.exe memfs-%Suffix%.exe) do (
     if [!Files!] == [] (
@@ -19,5 +23,22 @@ for %%f in (winfsp-%Suffix%.sys winfsp-%Suffix%.dll winfsp-tests-%Suffix%.exe me
         set Files=!Files!,'%~dp0..\build\VStudio\build\%Config%\%%f'
     )
 )
+set Files=
+for %%f in (
+    %~dp0..\build\VStudio\build\%Config%\
+        winfsp-%Suffix%.sys
+        winfsp-%Suffix%.dll
+        winfsp-tests-%Suffix%.exe
+        memfs-%Suffix%.exe
+        deploy-setup.bat
+    ) do (
+    set File=%%~f
+    if [!File:~-1!] == [\] (
+        set Dir=!File!
+    ) else (
+        if not [!Files!] == [] set Files=!Files!,
+        set Files=!Files!'!Dir!!File!'
+    )
+)
 
 powershell -NoProfile -ExecutionPolicy Bypass -Command "& '%~dp0deploy.ps1' -Name '%Target%' -CheckpointName '%Chkpnt%' -Files !Files! -Destination '%Deploy%'"