Final fixes to new build process