diff --git a/create_project.cmd b/create_project.cmd
index 1ba4267..d18be5a 100644
--- a/create_project.cmd
+++ b/create_project.cmd
@@ -4,5 +4,7 @@ setlocal
 
 pushd "%~dp0%"
 call src\scripts\setup_msys2.cmd
-call mingw64 -no-start ./create_project.sh "%1" "%2"
+
+for /f "usebackq tokens=*" %%i in (`cygpath "%2"`) do set ARG1=%%i
+call mingw64 -no-start ./create_project.sh "%1" "%ARG1%"
 popd
diff --git a/scripts/test_msys2.cmd b/scripts/test_msys2.cmd
index 36569fc..fb50983 100755
--- a/scripts/test_msys2.cmd
+++ b/scripts/test_msys2.cmd
@@ -16,10 +16,6 @@ popd
 
 set "TEST_DIR=%SOURCE_DIR%\build"
 
-echo %SCRIPTS_DIR%
-echo %SOURCE_DIR%
-echo %TEST_DIR%
-
 set "PLATFORM=msys2"
 set "BUILD_TYPE=%1"
 set "WITH_TYPE=%2"
@@ -46,7 +42,7 @@ if "%WITH_TYPE%"=="7" set "NAME=%NAME%_crypto_no_boost"
 if exist "%TEST_DIR%\%NAME%\" rd /s /q "%TEST_DIR%\%NAME%"
 
 pushd "%SOURCE_DIR%"
-call .\create_project.cmd %NAME% %TEST_DIR% || (
+call ".\create_project.cmd" "%NAME%" "%TEST_DIR%" || (
   call :ERROR_EXIT "Failed to create %PLATFORM% project." 2
 )
 popd
diff --git a/src/scripts/setup_msys2.sh b/src/scripts/setup_msys2.sh
index bc1fab0..499bf96 100755
--- a/src/scripts/setup_msys2.sh
+++ b/src/scripts/setup_msys2.sh
@@ -14,6 +14,7 @@ PROJECT_MSYS2_PACKAGE_LIST+=(
   mingw64/mingw-w64-x86_64-diffutils
   mingw64/mingw-w64-x86_64-gcc
   mingw64/mingw-w64-x86_64-gdb
+  mingw64/mingw-w64-x86_64-git-lfs
   mingw64/mingw-w64-x86_64-icu
   mingw64/mingw-w64-x86_64-make
   mingw64/mingw-w64-x86_64-mesa
diff --git a/update_project.cmd b/update_project.cmd
index 10b6e4b..064b37d 100644
--- a/update_project.cmd
+++ b/update_project.cmd
@@ -3,5 +3,6 @@
 setlocal
 
 pushd "%~dp0%"
-call mingw64 -no-start ./update_project.sh "%1" "%2"
+for /f "usebackq tokens=*" %%i in (`cygpath "%2"`) do set ARG1=%%i
+call mingw64 -no-start ./update_project.sh "%1" "%ARG1%"
 popd