Minor tweaks to build process