Build settings and broom adjustements.
Merged build settings.