Small tweaks for the build script