Small NPC fixes