Fix a few issues with teams