Fix a team bugs