More fixes with navigation.