further navigation fixes