Fix some random team generators