Make some navigation fixes