More group fixes