diff --git a/src/public/app/services/note_content_renderer.js b/src/public/app/services/note_content_renderer.js
index 8852cdec7..34b0cd8b7 100644
--- a/src/public/app/services/note_content_renderer.js
+++ b/src/public/app/services/note_content_renderer.js
@@ -6,6 +6,8 @@ import libraryLoader from "./library_loader.js";
 import openService from "./open.js";
 import froca from "./froca.js";
 
+let idCounter = 1;
+
 async function getRenderedContent(note, options = {}) {
     options = Object.assign({
         trim: false,
@@ -93,7 +95,7 @@ async function getRenderedContent(note, options = {}) {
             .css("justify-content", "space-around");
 
         try {
-            mermaid.mermaidAPI.render("mermaid-graph", content,
+            mermaid.mermaidAPI.render("in-mermaid-graph-" + idCounter++, content,
                     content => $renderedContent.append($(content)));
         } catch (e) {
             const $error = $("<p>The diagram could not displayed.</p>");
diff --git a/src/public/app/widgets/buttons/note_actions.js b/src/public/app/widgets/buttons/note_actions.js
index ddfc429e0..26ee2a902 100644
--- a/src/public/app/widgets/buttons/note_actions.js
+++ b/src/public/app/widgets/buttons/note_actions.js
@@ -35,6 +35,10 @@ const TPL = `
 </div>`;
 
 export default class NoteActionsWidget extends NoteContextAwareWidget {
+    isEnabled() {
+        return true;
+    }
+
     doRender() {
         this.$widget = $(TPL);
 
diff --git a/src/public/app/widgets/mermaid.js b/src/public/app/widgets/mermaid.js
index 04a6b838a..e00148ab6 100644
--- a/src/public/app/widgets/mermaid.js
+++ b/src/public/app/widgets/mermaid.js
@@ -18,20 +18,16 @@ const TPL = `<div class="mermaid-widget">
     </style>
 
     <div class="mermaid-error alert alert-warning">
-        <p><strong>The diagram could not displayed.</strong></p>
-        <p class="error-content">Rendering diagram...</p>
+        <p><strong>The diagram could not displayed. See <a href="https://mermaid-js.github.io/mermaid/#/flowchart?id=graph">help and examples</a>.</strong></p>
+        <p class="error-content"></p>
     </div>
 
     <div class="mermaid-render"></div>
 </div>`;
 
+let idCounter = 1;
+
 export default class MermaidWidget extends NoteContextAwareWidget {
-    constructor() {
-        super();
-
-        this.idCounter = 1;
-    }
-
     isEnabled() {
         return super.isEnabled() && this.note && this.note.type === 'mermaid';
     }
@@ -45,6 +41,8 @@ export default class MermaidWidget extends NoteContextAwareWidget {
     }
 
     async refreshWithNote(note) {
+        this.$errorContainer.hide();
+
         await libraryLoader.requireLibrary(libraryLoader.MERMAID);
 
         const documentStyle = window.getComputedStyle(document.documentElement);
@@ -57,14 +55,12 @@ export default class MermaidWidget extends NoteContextAwareWidget {
 
         this.$display.empty();
 
-        this.$errorMessage.text('Rendering diagram...');
-
         try {
-            mermaid.mermaidAPI.render('graphDiv-' + this.idCounter++, content, content => this.$display.html(content));
+            mermaid.mermaidAPI.render('mermaid-graph-' + idCounter++, content, content => this.$display.html(content));
 
             this.$errorContainer.hide();
         } catch (e) {
-            this.$errorMessage.text(e.message).append(`<br/><br/><p>See <a href="https://mermaid-js.github.io/mermaid/#/flowchart?id=graph">help and examples</a>.</p>`);
+            this.$errorMessage.text(e.message);
             this.$errorContainer.show();
         }
     }
diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js
index 92a9eb19d..02cd4b195 100644
--- a/src/services/consistency_checks.js
+++ b/src/services/consistency_checks.js
@@ -624,7 +624,8 @@ class ConsistencyChecks {
 
             ws.sendMessageToAllClients({type: 'consistency-checks-failed'});
         } else {
-            log.info(`All consistency checks passed (took ${elapsedTimeMs}ms)`);
+            log.info(`All consistency checks passed (took ${elapsedTimeMs}ms)` +
+                (this.fixedIssues ? " after some fixes" : "with no errors detected"));
         }
     }
 }