Fix team and oteam to work