Extra tweaks to build process