More small changes to NPC controls.