fixes for Navigation