Fix join and leave