Folders follow up

Initial follow-up, still some pending
Would `canManageAllFolders` not take care of these checks?