Navigation fixes.