Final fixes for navigation.