Tweaked build process