More fixes dealing with navigation.