Fixes in SpawnCounter