More build script tweaks