Adjustments to build process