More build script fixes.