fix some issues in teams and team-create