More teams bugfixes