NPC edits for Mantis 9984