more build code tightening