Fixing navigation issues.