Adjustments for build