Spawn time improvements