Add some minor changes to the build process