diff --git a/package-lock.json b/package-lock.json
index 3df0bbd..f4914af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
 			},
 			"devDependencies": {
 				"@types/mocha": "^2.2.48",
-				"@types/node": "^8.10.25",
+				"@types/node": "^16.18.0",
 				"@types/vscode": "^1.73.1",
 				"@typescript-eslint/eslint-plugin": "^5.45.0",
 				"@typescript-eslint/parser": "^5.45.0",
@@ -442,9 +442,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "8.10.66",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz",
-			"integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==",
+			"version": "16.18.126",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.126.tgz",
+			"integrity": "sha512-OTcgaiwfGFBKacvfwuHzzn1KLxH/er8mluiy8/uM3sGXHaRe73RrSIj01jow9t4kJEW633Ov+cOexXeiApTyAw==",
 			"license": "MIT"
 		},
 		"node_modules/@types/q": {
diff --git a/package.json b/package.json
index 8080985..0223d88 100644
--- a/package.json
+++ b/package.json
@@ -64,12 +64,12 @@
 			{
 				"command": "rech.editor.batch.tab",
 				"title": "Rech Batch: Performs a tab and sets the cursor on the most appropriate batch column",
-				"when": "!inlineSuggestionVisible"
+				"when": "editorLangId == bat && !inlineSuggestionVisible && !inlineEditIsVisible"
 			},
 			{
 				"command": "rech.editor.batch.revtab",
 				"title": "Rech Batch: Performs a reverse-tab and sets the cursor on the most appropriate batch column",
-				"when": "!inlineSuggestionVisible"
+				"when": "editorLangId == bat && !inlineSuggestionVisible && !inlineEditIsVisible"
 			}
 		],
 		"keybindings": [
@@ -149,7 +149,7 @@
 	},
 	"devDependencies": {
 		"@types/mocha": "^2.2.48",
-		"@types/node": "^8.10.25",
+		"@types/node": "^16.18.0",
 		"@types/vscode": "^1.73.1",
 		"@typescript-eslint/eslint-plugin": "^5.45.0",
 		"@typescript-eslint/parser": "^5.45.0",
diff --git a/tsconfig.json b/tsconfig.json
index 836607b..15e0ea2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,26 +1,30 @@
 {
-    "compilerOptions": {
-      /* Basic Options */
-      "target": "es6",
-      "module": "commonjs",
-      "lib": [
-        "es6"
-      ],
-      "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-      "sourceMap": true,                     /* Generates corresponding '.map' file. */
-      "outDir": "./out",                        /* Redirect output structure to the directory. */
-      "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-      "composite": true,                     /* Enable project compilation */
-      /* Strict Type-Checking Options */
-      "strict": true,                           /* Enable all strict type-checking options. */
-      "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-      /* Additional Checks */
-      "noUnusedParameters": true,            /* Report errors on unused parameters. */
-      "noImplicitReturns": false,             /* Report error when not all code paths in function return a value. */
-      "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
-      /* Module Resolution Options */
-      "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-      "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-      "esModuleInterop": true,                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    }
-  }
\ No newline at end of file
+  "compilerOptions": {
+    /* Basic Options */
+    "target": "ES2020",
+    "module": "commonjs",
+    "lib": [
+      "ES2020"
+    ],
+    "declaration": true,
+    "sourceMap": true,
+    "outDir": "./out",
+    "rootDir": "./src",
+    "composite": true,
+    /* Strict Type-Checking Options */
+    "strict": true,
+    "noImplicitAny": true,
+    /* Additional Checks */
+    "noUnusedParameters": true,
+    "noImplicitReturns": false,
+    "noFallthroughCasesInSwitch": true,
+    /* Module Resolution Options */
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    /* Environment Types */
+    "types": ["node"],
+    /* Speed up by skipping node_modules checks */
+    "skipLibCheck": true
+  }
+}
\ No newline at end of file