diff --git a/libraries/codemirror/addon/lint/eslint.js b/libraries/codemirror/addon/lint/eslint.js
index b1ab412e3..1751df1d5 100644
--- a/libraries/codemirror/addon/lint/eslint.js
+++ b/libraries/codemirror/addon/lint/eslint.js
@@ -29,8 +29,8 @@
 
     async function validatorJavaScript(text, options) {
         if (glob.isMobile()
-            || glob.getActiveTabNote() == null
-            || glob.getActiveTabNote().mime === 'application/json') {
+            || glob.getActiveContextNote() == null
+            || glob.getActiveContextNote().mime === 'application/json') {
             // eslint doesn't seem to validate pure JSON well
             return [];
         }
diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js
index 8baa9e080..f69a40330 100644
--- a/src/services/backend_script_api.js
+++ b/src/services/backend_script_api.js
@@ -27,11 +27,11 @@ const exportService = require("./export/zip");
  * @constructor
  */
 function BackendScriptApi(currentNote, apiParams) {
-    /** @property {BNote} note where script started executing */
+    /** @property {BNote} note where the script started executing */
     this.startNote = apiParams.startNote;
-    /** @property {BNote} note where script is currently executing. Don't mix this up with concept of active note */
+    /** @property {BNote} note where the script is currently executing. Don't mix this up with the concept of active note */
     this.currentNote = currentNote;
-    /** @property {AbstractBeccaEntity} entity whose event triggered this executions */
+    /** @property {AbstractBeccaEntity} entity whose event triggered this execution */
     this.originEntity = apiParams.originEntity;
 
     for (const key in apiParams) {