Fix teams in initial startup