Small Fixes for the build script