Some build polishing