Fix a few things in teams