Minor tweaks to the build process