more group fixes