Fix problems with navigation.