fixes for navigation