Tweaks to make build.bat run from scripts