Fix NPC navigator NPEs