npc waypoint fixes