[Alex] More improvements to spawn system.