This will probably also reduce builds at startup.
Limits may require tweaks after further testing.