diff --git a/customize.dist/src/less2/include/toolbar-history.less b/customize.dist/src/less2/include/toolbar-history.less
index 76950ba11..6495611de 100644
--- a/customize.dist/src/less2/include/toolbar-history.less
+++ b/customize.dist/src/less2/include/toolbar-history.less
@@ -291,10 +291,10 @@
         }
 
         .cp-history-timeline-pos {
-            // width: 2px;
+            //width: 2px;
             border: 2px solid @cryptpad_text_col;
             height: 37px;
-            // background: @pos-color;
+            //background: @pos-color;
             position: absolute;
             svg {
                 top: -14px;
diff --git a/lib/storage/file.js b/lib/storage/file.js
index e196ec68f..b6b42a1c1 100644
--- a/lib/storage/file.js
+++ b/lib/storage/file.js
@@ -288,7 +288,7 @@ var closeChannel = function (env, channelName, cb) {
 
 var closeInactiveChannels = function (env, schedule, active) {
     Object.keys(env.channels).forEach(channelName => {
-        if (!active.has(channelName)) {
+        if (!active.includes(channelName)) {
             schedule.ordered(channelName, function (next) {
                 closeChannel(env, channelName, next);
             });
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index f5b1831a5..0466f4e3b 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2384,6 +2384,7 @@ define([
                     var $restricted = $restrictedIcon.clone().appendTo($state);
                     $restricted.attr('title', Messages.fm_restricted);
                 }
+
                 var $shared = $sharedIcon.clone().appendTo($state);
                 $shared.attr('title', Messages.fm_canBeShared);
             } else if ($content.data('readOnlyFolder') || APP.readOnly) {
diff --git a/www/common/onlyoffice/history.js b/www/common/onlyoffice/history.js
index ebdf3549d..db6ce9b9f 100644
--- a/www/common/onlyoffice/history.js
+++ b/www/common/onlyoffice/history.js
@@ -88,7 +88,7 @@ define([
                 if (!Array.isArray(data.messages)) { return void console.error('Not an array!'); }
 
                 let initialCp = cpIndex === sortedCp.length;
-                var messages = (data.messages || []).slice(initialCp || config.docType() === 'spreadsheet' ? 0 : 1);
+                var messages = (data.messages || []).slice(initialCp || (config.docType() === 'spreadsheet' && toHash === 'NONE') ? 0 : 1);
                 if (config.debug) { console.log(data.messages); }
                 id = typeof(id) !== "undefined" ? id : getId();
 
@@ -109,6 +109,7 @@ define([
                 // Get the checkpoint ID
                 id = typeof(id) !== "undefined" ? id : getId();
                 var cp;
+                console.log("HELLO", ooMessages, id, ooMessages[id-1])
                 if (ooMessages[id-1] && !ooMessages[id-1].length) {
                     cp = hashes[id-1];
                 } else {
@@ -300,7 +301,7 @@ define([
                         config.onPatchBack(hashes[cpNo], q);
                         patch = msgs[patchNo];
                     }
-                    position = msgs.indexOf(patch)
+                    position = msgs.indexOf(patch);
                     msgIndex = position === -1 ? -1 : position - msgs.length-1;
                     showVersion(false, position);
                     update();
diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 4f36051f5..78fc765f7 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -3073,6 +3073,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
             readOnly = privateData.readOnly;
 
             Title = common.createTitle({});
+
             var configTb = {
                 displayed: ['pad'],
                 title: Title.getTitleConfig(),
diff --git a/www/common/sframe-common-history.js b/www/common/sframe-common-history.js
index 6a39df777..65068d700 100644
--- a/www/common/sframe-common-history.js
+++ b/www/common/sframe-common-history.js
@@ -689,7 +689,7 @@ define([
 
         // Load all the history messages into a new chainpad object
         loadMoreHistory(config, common, function (err, newRt, isFull) {
-            // History.readOnly = common.getMetadataMgr().getPrivateData().readOnly;
+            History.readOnly = common.getMetadataMgr().getPrivateData().readOnly;
             History.loading = false;
             if (err) {
                 console.error(err);