Group management Defect fixes