diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js
index b9c9197fa..93fadcf0f 100644
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@@ -697,12 +697,12 @@ define([
                 });
             };
 
-            fixSharedFolders();
             fixRoot();
             fixTrashRoot();
             fixTemplate();
             fixFilesData();
             fixDrive();
+            fixSharedFolders();
 
             if (JSON.stringify(files) !== before) {
                 debug("Your file system was corrupted. It has been cleaned so that the pads you visit can be stored safely");
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index bb86c44f4..4f61a7215 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -432,6 +432,7 @@ define([
                 var validate = nSecret.keys.validateKey;
                 var crypto = Crypto.createEncryptor(nSecret.keys);
                 Cryptpad.getHistoryRange({
+                    drive: cfg.isDrive,
                     channel: channel,
                     validateKey: validate,
                     lastKnownHash: data.lastKnownHash
diff --git a/www/common/userObject.js b/www/common/userObject.js
index d4f994cdc..c7aef75b1 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -83,7 +83,7 @@ define([
 
         var isSharedFolder = exp.isSharedFolder = function (element) {
             if (sharedFolder) { return false; } // No recursive shared folders
-            return Boolean(files[SHARED_FOLDERS][element]);
+            return Boolean(files[SHARED_FOLDERS] && files[SHARED_FOLDERS][element]);
         };
         var isFile = exp.isFile = function (element, allowStr) {
             if (isSharedFolder(element)) { return false; }
diff --git a/www/drive/tests.js b/www/drive/tests.js
index 67d986d86..015178208 100644
--- a/www/drive/tests.js
+++ b/www/drive/tests.js
@@ -70,7 +70,7 @@ define([
 
     module.test = function (assert) {
         var config = {
-            pinPads: Cryptpad.pinPads,
+            outer: true,
             workgroup: false,
             testMode: true,
             loggedIn: false