fix some small issues with spawner code