Navigation bug fixes