More navigation fixes.