NPC improvements