More tweaks to build scripts