more spawn escape fixes