More fixes for navigation