Fix nav issues.