Minor navigation fixes