Teambuilder sprite/gen fixes