More Necrodoom fixes.