Add more membership fixes