Minor build script fixes