Fix join and disconnect :)