More build.bat tweaking.