Two small build script fixes

Two small build script fixes.