Even more NPC fixes