Minor change in team handling.