Fixing issues with build script.