more fixups about groups