More nav fixes.