More teams fixes