Final build adjustments