Tweak build process