Misc navigation fixes