diff --git a/cSpell.json b/cSpell.json
index 94276b683..82e300b8e 100644
--- a/cSpell.json
+++ b/cSpell.json
@@ -90,8 +90,12 @@
     "sidharth",
     "sidharthv",
     "sphinxcontrib",
+    "startx",
+    "starty",
     "statediagram",
     "steph",
+    "stopx",
+    "stopy",
     "stylis",
     "substate",
     "sveidqvist",
@@ -104,6 +108,7 @@
     "tuleap",
     "ugge",
     "unist",
+    "valign",
     "verdana",
     "viewports",
     "vinod",
diff --git a/packages/mermaid/src/diagrams/c4/svgDraw.js b/packages/mermaid/src/diagrams/c4/svgDraw.js
index ce465cad3..5ca2f55f8 100644
--- a/packages/mermaid/src/diagrams/c4/svgDraw.js
+++ b/packages/mermaid/src/diagrams/c4/svgDraw.js
@@ -1,4 +1,4 @@
-import common from '../common/common';
+import common from '../common/common.js';
 import * as svgDrawCommon from '../common/svgDrawCommon';
 import { sanitizeUrl } from '@braintree/sanitize-url';
 
diff --git a/packages/mermaid/src/diagrams/common/svgDrawCommon.js b/packages/mermaid/src/diagrams/common/svgDrawCommon.js
index e054f53b6..9a4ce8aa2 100644
--- a/packages/mermaid/src/diagrams/common/svgDrawCommon.js
+++ b/packages/mermaid/src/diagrams/common/svgDrawCommon.js
@@ -77,7 +77,7 @@ export const drawEmbeddedImage = function (elem, x, y, link) {
   const imageElem = elem.append('use');
   imageElem.attr('x', x);
   imageElem.attr('y', y);
-  var sanitizedLink = sanitizeUrl(link);
+  const sanitizedLink = sanitizeUrl(link);
   imageElem.attr('xlink:href', '#' + sanitizedLink);
 };
 
@@ -112,11 +112,3 @@ export const getTextObj = function () {
     valign: undefined,
   };
 };
-
-export default {
-  drawRect,
-  drawImage,
-  drawText,
-  getNoteRect,
-  getTextObj,
-};