Adjustments to build process 2