Build script fixes.