Fixed more bugs in teams