The much needed navigation and locator fixes