Various navigation-level bug fixes