Fixes concerning navigation and permissions