Minor bugfixes, including hopefully a fix for random-ass necrosis.