Fixed Team joining and team-killing