Tweaks to build process