Fix more flaws in random teams for custom rosters.