Some navigator fixes