More fixes to navigation