Minor changes to group and groupmember