Small improvements to the build scripts