Minor navigation improvements