More build script tweaks.