Fix navigation issues.