Minor build script changes