More build script changes