diff --git a/.eslintrc.js b/.eslintrc.js
index 9940eeef85..f050b757d3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -24,8 +24,6 @@ module.exports = {
     ...base.rules,
     // add override for any (a metric ton of them, initial conversion)
     '@typescript-eslint/no-explicit-any': 'off',
-    // these should be removed, there are 8 of them as errors
-    '@typescript-eslint/no-non-null-assertion': 'off',
     // this seems very broken atm, false positives
     '@typescript-eslint/unbound-method': 'off'
   }
diff --git a/package.json b/package.json
index f53d0006c2..17182459f0 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "@babel/core": "^7.13.1",
     "@babel/register": "^7.13.0",
     "@babel/runtime": "^7.13.7",
-    "@polkadot/dev": "^0.61.28",
+    "@polkadot/dev": "^0.61.30",
     "@polkadot/ts": "^0.3.59",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^26.0.20",
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
index 14de9fb875..09b5db5154 100644
--- a/packages/rpc-provider/package.json
+++ b/packages/rpc-provider/package.json
@@ -26,6 +26,6 @@
     "@polkadot/keyring": "^5.8.1",
     "@polkadot/metadata": "3.10.3-10",
     "mock-socket": "^9.0.3",
-    "nock": "^13.0.7"
+    "nock": "^13.0.8"
   }
 }
diff --git a/packages/typegen/src/util/imports.ts b/packages/typegen/src/util/imports.ts
index 481ee5e737..09e1140ca3 100644
--- a/packages/typegen/src/util/imports.ts
+++ b/packages/typegen/src/util/imports.ts
@@ -70,8 +70,8 @@ export function setImports (allDefs: Record<string, ModuleTypes>, imports: TypeI
         setImports(allDefs, imports, [typeDef.sub.type]);
       }
     } else if (type.includes('[') && type.includes('|')) {
-      // We split the types
-      const splitTypes = /\[\s?(.+?)\s?\]/.exec(type)![1].split(/\s?\|\s?/);
+      // We split the types (we already dod the check above, so safe-path should not be caught)
+      const splitTypes = (/\[\s?(.+?)\s?\]/.exec(type) || ['', ''])[1].split(/\s?\|\s?/);
 
       setImports(allDefs, imports, splitTypes);
     } else {
diff --git a/yarn.lock b/yarn.lock
index 9fedf6edaa..6794a71b06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1048,7 +1048,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-runtime@npm:^7.13.6":
+"@babel/plugin-transform-runtime@npm:^7.13.7":
   version: 7.13.7
   resolution: "@babel/plugin-transform-runtime@npm:7.13.7"
   dependencies:
@@ -1292,7 +1292,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.13.6, @babel/runtime@npm:^7.13.7, @babel/runtime@npm:^7.8.4":
+"@babel/runtime@npm:^7.13.7, @babel/runtime@npm:^7.8.4":
   version: 7.13.7
   resolution: "@babel/runtime@npm:7.13.7"
   dependencies:
@@ -1821,9 +1821,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/dev@npm:^0.61.28":
-  version: 0.61.28
-  resolution: "@polkadot/dev@npm:0.61.28"
+"@polkadot/dev@npm:^0.61.30":
+  version: 0.61.30
+  resolution: "@polkadot/dev@npm:0.61.30"
   dependencies:
     "@babel/cli": ^7.13.0
     "@babel/core": ^7.13.1
@@ -1838,12 +1838,12 @@ __metadata:
     "@babel/plugin-syntax-import-meta": ^7.10.4
     "@babel/plugin-syntax-top-level-await": ^7.12.13
     "@babel/plugin-transform-regenerator": ^7.12.13
-    "@babel/plugin-transform-runtime": ^7.13.6
+    "@babel/plugin-transform-runtime": ^7.13.7
     "@babel/preset-env": ^7.13.5
     "@babel/preset-react": ^7.12.13
     "@babel/preset-typescript": ^7.13.0
     "@babel/register": ^7.13.0
-    "@babel/runtime": ^7.13.6
+    "@babel/runtime": ^7.13.7
     "@rushstack/eslint-patch": ^1.0.6
     "@typescript-eslint/eslint-plugin": 4.15.2
     "@typescript-eslint/parser": 4.15.2
@@ -1884,7 +1884,7 @@ __metadata:
     typedoc: ^0.20.28
     typedoc-plugin-markdown: ^3.5.0
     typedoc-plugin-no-inherit: ^1.2.0
-    typescript: ^4.2.2
+    typescript: ^4.1.5
     yargs: ^16.2.0
   bin:
     polkadot-ci-ghact-build: scripts/polkadot-ci-ghact-build.cjs
@@ -1907,7 +1907,7 @@ __metadata:
     polkadot-exec-tsc: scripts/polkadot-exec-tsc.cjs
     polkadot-exec-typedoc: scripts/polkadot-exec-typedoc.cjs
     polkadot-exec-webpack: scripts/polkadot-exec-webpack.cjs
-  checksum: 27be98f0da27d4087cc245c4fd45ee4bfa7bf0fbb09b7d2691b6934f48e14c0991b8c8751e65aa0e51dc73923e2023bc46111b14ae6864ad7900eed590b35de7
+  checksum: 786a7d09e6397fbc36de0fc0c657eb9e3807ba4e5b017b64d19341c8c7c49f3faed5be3e47bd5ec7746490636ac4091866469a1667402b6cb987a19dc8143bbb
   languageName: node
   linkType: hard
 
@@ -1978,7 +1978,7 @@ __metadata:
     bn.js: ^4.11.9
     eventemitter3: ^4.0.7
     mock-socket: ^9.0.3
-    nock: ^13.0.7
+    nock: ^13.0.8
   languageName: unknown
   linkType: soft
 
@@ -7916,15 +7916,15 @@ fsevents@~2.1.2:
   languageName: node
   linkType: hard
 
-"nock@npm:^13.0.7":
-  version: 13.0.7
-  resolution: "nock@npm:13.0.7"
+"nock@npm:^13.0.8":
+  version: 13.0.8
+  resolution: "nock@npm:13.0.8"
   dependencies:
     debug: ^4.1.0
     json-stringify-safe: ^5.0.1
     lodash.set: ^4.3.2
     propagate: ^2.0.0
-  checksum: db77afdd757bb9f5496783a9f7cc30eb0664195c469d0b01e2e956545e6c08b24482a4a3fcdf4eef1713da30baa880bde244bac6c546733d5b3a59c6838d24b1
+  checksum: a112509dcf9a7b629a250ec043d6595a5779e115f112d9606a67db280fdb3798fc66318e835ef6475a208137aaafcee18ebed42d893c94165763bbac35d2cd66
   languageName: node
   linkType: hard
 
@@ -9404,7 +9404,7 @@ fsevents@~2.1.2:
     "@babel/core": ^7.13.1
     "@babel/register": ^7.13.0
     "@babel/runtime": ^7.13.7
-    "@polkadot/dev": ^0.61.28
+    "@polkadot/dev": ^0.61.30
     "@polkadot/ts": ^0.3.59
     "@polkadot/typegen": "workspace:packages/typegen"
     "@types/jest": ^26.0.20