Adjustments to build config