Some bugfixes with membership