Fix a couple of navigation-related issues