Fixes for navigation.