Group membership fixes