More fixes for smooth building