few fixes to the previous navigation update
Merge pull request #2413 from awesomerobot/master

few fixes to the previous navigation update