Membership fixes