NPC location tweaks