More navigation fixes