Fix some problems with navigation