Fix NPC processing on map load