spawner fixes