Fixes in build script