Change navigation back to MC navigation and fix duplicate NPCs clientside