Tweaks to improve build script quality