MDL-27809 navigation: Fixed up a couple of minor issues after peer-review