Fixes on membership workflow