diff --git a/xb.bat b/xb.bat
index c5d724c48..a35b701fc 100644
--- a/xb.bat
+++ b/xb.bat
@@ -1,7 +1,7 @@
 @ECHO OFF
 REM Copyright 2015 Ben Vanik. All Rights Reserved.
 
-SET DIR=%~dp0
+SET "DIR=%~dp0"
 
 REM ============================================================================
 REM Environment Validation
@@ -20,7 +20,7 @@ REM ============================================================================
 REM Trampoline into xenia-build
 REM ============================================================================
 
-"%PYTHON_EXE%" xenia-build %*
+"%PYTHON_EXE%" "%DIR%\xenia-build" %*
 EXIT /b %ERRORLEVEL%
 
 
@@ -33,19 +33,23 @@ SETLOCAL ENABLEDELAYEDEXPANSION
 
 SET FOUND_PATH=""
 
-SET CANDIDATE_PATHS[0]=C:\python37\python.exe
-SET CANDIDATE_PATHS[1]=C:\python36\python.exe
-SET CANDIDATE_PATHS[2]=C:\python35\python.exe
-SET CANDIDATE_PATHS[3]=C:\python34\python.exe
+SET "CANDIDATE_PATHS[0]=C:\python37\python.exe"
+SET "CANDIDATE_PATHS[1]=C:\python36\python.exe"
+SET "CANDIDATE_PATHS[2]=C:\python35\python.exe"
+SET "CANDIDATE_PATHS[3]=C:\python34\python.exe"
 SET OUTPUT_INDEX=4
 
-FOR /F "usebackq" %%l IN (`2^>NUL where python3`) DO (
-  SET CANDIDATE_PATHS[!OUTPUT_INDEX!]=%%l
-  SET /A OUTPUT_INDEX+=1
+FOR /F "usebackq delims=" %%L IN (`2^>NUL where python3`) DO (
+  IF %%~zL NEQ 0 (
+    SET "CANDIDATE_PATHS[!OUTPUT_INDEX!]=%%L"
+    SET /A OUTPUT_INDEX+=1
+  )
 )
-FOR /F "usebackq" %%l IN (`2^>NUL where python`) DO (
-  SET CANDIDATE_PATHS[!OUTPUT_INDEX!]=%%l
-  SET /A OUTPUT_INDEX+=1
+FOR /F "usebackq delims=" %%L IN (`2^>NUL where python`) DO (
+  IF %%~zL NEQ 0 (
+    SET "CANDIDATE_PATHS[!OUTPUT_INDEX!]=%%L"
+    SET /A OUTPUT_INDEX+=1
+  )
 )
 
 SET CANDIDATE_INDEX=0
@@ -54,40 +58,30 @@ IF NOT DEFINED CANDIDATE_PATHS[%CANDIDATE_INDEX%] (
   GOTO :found_python
 )
 CALL SET CANDIDATE_PATH=%%CANDIDATE_PATHS[%CANDIDATE_INDEX%]%%
-IF NOT EXIST %CANDIDATE_PATH% (
+IF NOT EXIST "%CANDIDATE_PATH%" (
   SET /A CANDIDATE_INDEX+=1
   GOTO :check_candidate_loop
 )
-CALL :get_size %CANDIDATE_PATH%
-IF %_SIZE% NEQ 0 (
-  SET FOUND_PATH=%CANDIDATE_PATH%
-  GOTO :found_python
-)
-SET /A CANDIDATE_INDEX+=1
-GOTO :check_candidate_loop
+SET "FOUND_PATH=%CANDIDATE_PATH%"
 
 :found_python
-IF %FOUND_PATH%=="" (
+IF "%FOUND_PATH%"=="" (
   ECHO ERROR: no Python executable found on PATH.
   ECHO Make sure you can run 'python' or 'python3' in a Command Prompt.
   ENDLOCAL & SET _RESULT=1
   GOTO :eof
 )
 
-CMD /C %FOUND_PATH% -c "import sys; sys.exit(1 if not sys.version_info[:2] >= (3, 4) else 0)"
+CMD /C ""%FOUND_PATH%" -c "import sys; sys.exit(1 if not sys.version_info[:2] ^>= (3, 4) else 0)"
 IF %ERRORLEVEL% NEQ 0 (
-  ECHO ERROR: Python version mismatch - not 3.4+
-  ECHO Found Python executable was '%FOUND_PATH%'.
+  ECHO ERROR: Python version mismatch, not at least 3.4.
+  ECHO Found Python executable was "%FOUND_PATH%".
   ENDLOCAL & SET _RESULT=1
   GOTO :eof
 )
 
 ENDLOCAL & (
   SET _RESULT=0
-  SET PYTHON_EXE=%FOUND_PATH%
+  SET "PYTHON_EXE=%FOUND_PATH%"
 )
 GOTO :eof
-
-:get_size
-SET _SIZE=%~z1
-goto :eof