Handle unclean disconnect
Fix join command