Fixes some thread safety issues with old membership API