Fixup spawning