Build script changes