Tweak to build process