Some NPC fixes and updates