build.bat improvements