Fixes for navigation