Fix team stuff