diff --git a/build_scripts/Windows/build/build-installer.bat b/build_scripts/Windows/build/build-installer.bat
index 1063d8680..c986adbba 100644
--- a/build_scripts/Windows/build/build-installer.bat
+++ b/build_scripts/Windows/build/build-installer.bat
@@ -9,7 +9,7 @@ call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
 :: Initialize environment
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" standard
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
diff --git a/build_scripts/Windows/build/build.bat b/build_scripts/Windows/build/build.bat
index 30d20c59d..3fa8fb49a 100644
--- a/build_scripts/Windows/build/build.bat
+++ b/build_scripts/Windows/build/build.bat
@@ -52,7 +52,7 @@ title Build - %SourceName%%RsType%-%RsBuildConfig% [qmake]
 set RS_QMAKE_CONFIG=%RsBuildConfig% version_detail_bash_script rs_autologin retroshare_plugins
 if "%RsRetroTor%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retrotor
 
-qmake "%SourcePath%\RetroShare.pro" -r "CONFIG+=%RS_QMAKE_CONFIG%" "EXTERNAL_LIB_DIR=%BuildLibsPath%\libs"
+qmake "%SourcePath%\RetroShare.pro" -r -spec win32-g++ "CONFIG+=%RS_QMAKE_CONFIG%" "EXTERNAL_LIB_DIR=%BuildLibsPath%\libs"
 if errorlevel 1 goto error
 
 echo.
diff --git a/build_scripts/Windows/tools/download-file.bat b/build_scripts/Windows/tools/download-file.bat
index d42349ccb..b0e93be5f 100644
--- a/build_scripts/Windows/tools/download-file.bat
+++ b/build_scripts/Windows/tools/download-file.bat
@@ -8,6 +8,6 @@ if "%~2"=="" (
 )
 
 ::"%EnvCurlExe%" -L -k "%~1" -o "%~2"
-"%EnvWgetExe%" --continue "%~1" --output-document="%~2"
+"%EnvWgetExe%" --no-check-certificate --continue "%~1" --output-document="%~2"
 
 exit /B %ERRORLEVEL%