Fix navigation bugs.