Build script tweaks