More and more nav fixes.