More spawning fixes