diff --git a/tools/debug.bat b/tools/debug.bat
index b65d72cf..8ed7ae73 100755
--- a/tools/debug.bat
+++ b/tools/debug.bat
@@ -4,7 +4,7 @@ setlocal
 
 set DebugWorkspace=winfsp
 set DebugPort=50000
-set DebugKey=win8.debug.net.key
+set DebugKey=1.1.1.1
 
 set RegKey="HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots"
 set RegVal="KitsRoot10"
diff --git a/tools/deploy.bat b/tools/deploy.bat
index 7a059940..27ffb11d 100755
--- a/tools/deploy.bat
+++ b/tools/deploy.bat
@@ -5,6 +5,7 @@ setlocal
 set CONFIG=Debug
 set SUFFIX=x64
 set TARGET_MACHINE=WIN8DBG
+if not X%1==X set TARGET_MACHINE=%1
 set TARGET_ACCOUNT=\Users\%USERNAME%\Downloads\winfsp\
 set TARGET=\\%TARGET_MACHINE%%TARGET_ACCOUNT%