feat/nav - Fix issues introduced at the insistence of lint.