Fixes for build script.