0.25.09 (Nivve) spawning fixes