diff --git a/ms/do_vsprojects.bat b/ms/do_vsprojects.bat
index c787b6565da70..e47a655f59853 100644
--- a/ms/do_vsprojects.bat
+++ b/ms/do_vsprojects.bat
@@ -1,5 +1,7 @@
 @setLocal
-@echo off
+@if NOT "%_DEBUG%" GEQ "1" @echo off
+
+pushd %~dp0\..
 rem get vs tools
 call ms\setVSVars.bat VS12VC
 call "%_VS12VC%\vcvarsall" x86
diff --git a/ms/do_vsprojects14.bat b/ms/do_vsprojects14.bat
index fc59103b613f2..e1f414994be15 100644
--- a/ms/do_vsprojects14.bat
+++ b/ms/do_vsprojects14.bat
@@ -1,8 +1,11 @@
 @setLocal
-@echo off
+@if NOT "%_DEBUG%" GEQ "1" @echo off
+
+pushd %~dp0\..
 rem get vs tools
 call ms\setVSVars.bat VS14VC
 call "%_VS14VC%\vcvarsall" x86
+popd
 
 rem create VS Project
 if not exist vsout mkdir vsout
diff --git a/ms/do_vsprojects15.bat b/ms/do_vsprojects15.bat
index 1f72bd02730f6..aec370e67bf9d 100644
--- a/ms/do_vsprojects15.bat
+++ b/ms/do_vsprojects15.bat
@@ -1,8 +1,13 @@
 @setLocal
-@echo off
+@if NOT "%_DEBUG%" GEQ "1" @echo off
+
+pushd %~dp0\..
 rem get vs tools
+REM VS2017 dev prompt can change the folder. So push and pop it here again
+pushd %~dp0\..
 call ms\setVSVars.bat VS15VC
 call "%_VS15VC%\vcvarsall" x86 store
+popd
 
 rem create VS Project
 if not exist vsout mkdir vsout
diff --git a/ms/setVSvars.bat b/ms/setVSvars.bat
index 8c1bca3df76cb..633e605b3be89 100644
--- a/ms/setVSvars.bat
+++ b/ms/setVSvars.bat
@@ -1,5 +1,7 @@
-@echo off
+@if NOT "%_DEBUG%" GEQ "1" @echo off
+pushd %~dp0\..
 call:set_%1
+popd
 exit /b
 :set_universal10.0Win32
 	call:setVar _VS15VC VisualStudio15VC
@@ -209,7 +211,14 @@ exit /b
 	call:setVar _VS15VC VisualStudio15VC
 	call:setVar _WKITS10 WindowsKits10.0
 	call:setVar _WKITS10VER WindowsKits10Version
-	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\3.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\2.0.0.0\;%_WKITS10%references\%_WKITS10VER%.0\windows.foundation.foundationcontract\3.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\2.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\1.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\4.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\3.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\2.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\1.0.0.0\
+	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\3.0.0.0\
+	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\2.0.0.0\
+	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\1.0.0.0\
+	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\5.0.0.0\
+	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\4.0.0.0\
+	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\3.0.0.0\
+	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\2.0.0.0\
+	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\1.0.0.0\
 	goto :eof
 
 :end