Some minor changes to spawning