Start to fix up membership issues.