diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index e079ad2b9..b2489c22b 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2289,7 +2289,8 @@ define([
         var createTitle = function ($container, path, noStyle) {
             if (!path || path.length === 0) { return; }
             var isTrash = manager.isPathIn(path, [TRASH]);
-            if (APP.mobile() && !noStyle) { // noStyle means title in search result
+            // we assume that users viewing shared folders may want to see the "bread-crumb"
+            if (!APP.newSharedFolder && APP.mobile() && !noStyle) { // noStyle means title in search result
                 return $container;
             }
             var isVirtual = virtualCategories.indexOf(path[0]) !== -1;
@@ -3147,7 +3148,8 @@ define([
             if (APP.$burnThisDrive) {
                 APP.toolbar.$bottomR.append(APP.$burnThisDrive);
             }
-            collapseTreeButton();
+            // this button is not useful for unregistered users who do not have a tree worth looking at
+            if (APP.loggedIn) { collapseTreeButton(); }
             return $toolbar;
         };
 
diff --git a/www/common/outer/cache-store.js b/www/common/outer/cache-store.js
index fdb1f7668..514e18ab7 100644
--- a/www/common/outer/cache-store.js
+++ b/www/common/outer/cache-store.js
@@ -97,7 +97,7 @@ define([
     var checkCheckpoints = function (array) {
         if (!Array.isArray(array)) { return; }
         // Keep the last 100 messages
-        if (array.length > 100) {
+        if (array.length > 100) { // XXX
             array.splice(0, array.length - 100);
         }
         // Remove every message before the first checkpoint
diff --git a/www/form/main.js b/www/form/main.js
index 9ccac3d00..3b2c160a4 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -176,7 +176,7 @@ define([
                         validateKey: keys.secondaryValidateKey,
                         owners: [myKeys.edPublic],
                         crypto: crypto,
-                        Cache: Utils.Cache
+                        //Cache: Utils.Cache // XXX
                     };
                     var results = {};
                     config.onError = function (info) {