Fixes to navigation.