Add missing patch from previous commit. More spawner fixes. Fixes #548