diff --git a/build.cmd b/build.cmd
index 8640b9e7..c53e3e27 100644
--- a/build.cmd
+++ b/build.cmd
@@ -28,12 +28,12 @@ IF NOT EXIST %MSBUILD14_TOOLS_PATH% (
 
 IF EXIST %CACHED_NUGET% goto restore
 echo Downloading latest version of NuGet.exe...
-IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
+IF NOT EXIST "%LocalAppData%\NuGet" md "%LocalAppData%\NuGet"
 @powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/latest/nuget.exe' -OutFile '%CACHED_NUGET%'"
 
 :restore
 IF EXIST "%~dp0src\packages" goto build
-%CACHED_NUGET% restore %SOLUTION_PATH%
+"%CACHED_NUGET%" restore %SOLUTION_PATH%
 
 :build
 
diff --git a/src/managed/PostBuild.CreateInstaller/createinstaller.cmd b/src/managed/PostBuild.CreateInstaller/createinstaller.cmd
index 814503ff..fa11a8c9 100644
--- a/src/managed/PostBuild.CreateInstaller/createinstaller.cmd
+++ b/src/managed/PostBuild.CreateInstaller/createinstaller.cmd
@@ -22,7 +22,7 @@ ECHO Created Writer NuGet package.
 MOVE .\Releases\Setup.exe .\Releases\OpenLiveWriterSetup.exe
 ECHO Created Open Live Writer setup file.
 
-%LocalAppData%\Nuget\Nuget.exe pack .\OpenLiveWriter.Install.nuspec -version %dottedVersion% -basepath Releases
+"%LocalAppData%\Nuget\Nuget.exe" pack .\OpenLiveWriter.Install.nuspec -version %dottedVersion% -basepath Releases
 ECHO Created Writer Chocolatey Package
 
 :end