More nav fixes