Fixes some navigation issues.