more OnTeamJoin fixes