Fixes for the navigation