Fix some navigation issues.