Fixes to build ordering to minimize rebuilds. Fixes to extragroup object.