More fixes to support embedded groups