diff --git a/.kokoro/presubmit.bat b/.kokoro/presubmit.bat
index cb666d72..71c6511d 100644
--- a/.kokoro/presubmit.bat
+++ b/.kokoro/presubmit.bat
@@ -29,4 +29,4 @@ for /r %%a in (*.whl) do xcopy "%%a" %KOKORO_ARTIFACTS_DIR% /i
 goto :EOF
 
 :error
-exit /b 1
\ No newline at end of file
+exit /b 1
diff --git a/scripts/windows/build.bat b/scripts/windows/build.bat
index 64c5152f..21df8e26 100644
--- a/scripts/windows/build.bat
+++ b/scripts/windows/build.bat
@@ -33,18 +33,20 @@ FOR %%P IN (3.8, 3.9, 3.10, 3.11, 3.12) DO (
 
     py -%%P-64 -m pip install --upgrade pip
 
-    set PIP_TARGET=%cd%\%%P-install\
-    MKDIR %PIP_TARGET%
+    set TARGET=%cd%\%%P-install\
+    mkdir %TARGET%
 
     echo "Installing cmake for Python %%P"
     py -%%P-64 -m pip install cmake --target=%PIP_TARGET%
-    set cmake=%PIP_TARGET%\Scripts\cmake
+    set cmake=%TARGET%\Scripts\cmake
 
     @rem Add directory as safe to avoid "detected dubious ownership" fatal issue
     git config --global --add safe.directory %cd%
+    git config --global --add C:/tmpfs/src/github/python-crc32c
     git submodule update --init --recursive
 
     git config --global --add safe.directory %cd%\google_crc32c
+    git config --global --add C:/tmpfs/src/github/python-crc32c/google_crc32c
     pushd google_crc32c
     @rem reset hard to cleanup any changes done by a previous build.
     git reset --hard