diff --git a/package.json b/package.json
index d7a2be1206..cb0d27c0da 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@babel/core": "^7.16.5",
     "@babel/register": "^7.16.5",
     "@babel/runtime": "^7.16.5",
-    "@polkadot/dev": "^0.64.13",
+    "@polkadot/dev": "^0.64.14",
     "@polkadot/ts": "^0.4.22",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^27.0.3",
diff --git a/packages/api-contract/tsconfig.json b/packages/api-contract/tsconfig.json
index 9e00b3f0c0..dd6d6d290b 100644
--- a/packages/api-contract/tsconfig.json
+++ b/packages/api-contract/tsconfig.json
@@ -16,7 +16,6 @@
   "references": [
     { "path": "../api" },
     { "path": "../types" },
-    { "path": "../types-create" },
-    { "path": "../types-support" }
+    { "path": "../types-create" }
   ]
 }
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
index 3034a01307..46fa549cb7 100644
--- a/packages/api-derive/package.json
+++ b/packages/api-derive/package.json
@@ -25,6 +25,7 @@
   "dependencies": {
     "@babel/runtime": "^7.16.5",
     "@polkadot/api": "7.0.3-3",
+    "@polkadot/api-augment": "7.0.3-3",
     "@polkadot/api-base": "7.0.3-3",
     "@polkadot/rpc-core": "7.0.3-3",
     "@polkadot/types": "7.0.3-3",
diff --git a/packages/api-derive/tsconfig.json b/packages/api-derive/tsconfig.json
index 9fe3ef8dc3..bcfafd5181 100644
--- a/packages/api-derive/tsconfig.json
+++ b/packages/api-derive/tsconfig.json
@@ -13,7 +13,6 @@
   "references": [
     { "path": "../api-base" },
     { "path": "../api-augment" },
-    { "path": "../rpc-augment" },
     { "path": "../rpc-core" },
     { "path": "../types" },
     { "path": "../types-codec" }
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
index d95a4ae9e1..1387c9b648 100644
--- a/packages/typegen/package.json
+++ b/packages/typegen/package.json
@@ -34,6 +34,7 @@
     "@babel/register": "^7.16.5",
     "@babel/runtime": "^7.16.5",
     "@polkadot/api": "7.0.3-3",
+    "@polkadot/api-augment": "7.0.3-3",
     "@polkadot/rpc-augment": "7.0.3-3",
     "@polkadot/rpc-provider": "7.0.3-3",
     "@polkadot/types": "7.0.3-3",
diff --git a/packages/typegen/tsconfig.json b/packages/typegen/tsconfig.json
index bdd3784fe9..8a815a4f63 100644
--- a/packages/typegen/tsconfig.json
+++ b/packages/typegen/tsconfig.json
@@ -11,7 +11,6 @@
     { "path": "../rpc-augment" },
     { "path": "../rpc-provider" },
     { "path": "../types" },
-    { "path": "../types-augment" },
     { "path": "../types-augment-lookup" },
     { "path": "../types-codec" },
     { "path": "../types-create" },
diff --git a/packages/types-codec/tsconfig.spec.json b/packages/types-codec/tsconfig.spec.json
index f5c535244a..c1858306ff 100644
--- a/packages/types-codec/tsconfig.spec.json
+++ b/packages/types-codec/tsconfig.spec.json
@@ -15,6 +15,7 @@
   ],
   "references": [
     { "path": "../types" },
-    { "path": "../types-augment" }
+    { "path": "../types-augment" },
+    { "path": "../types-support" }
   ]
 }
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
index d7df5670f6..db8b5f0f3c 100644
--- a/packages/types/tsconfig.json
+++ b/packages/types/tsconfig.json
@@ -12,7 +12,6 @@
   ],
   "references": [
     { "path": "../types-codec" },
-    { "path": "../types-create" },
-    { "path": "../types-support" }
+    { "path": "../types-create" }
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index d97624712e..c396c2a4d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1949,9 +1949,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/dev@npm:^0.64.13":
-  version: 0.64.13
-  resolution: "@polkadot/dev@npm:0.64.13"
+"@polkadot/dev@npm:^0.64.14":
+  version: 0.64.14
+  resolution: "@polkadot/dev@npm:0.64.14"
   dependencies:
     "@babel/cli": ^7.16.0
     "@babel/core": ^7.16.5
@@ -2036,7 +2036,7 @@ __metadata:
     polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs
     polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs
     polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs
-  checksum: f6b11e40be09fd9a668d56eed5f329f6f7c554eea5e74ae90050d28eba121a9a7d9a8031e8a19f0767e0f0013bb4cac50b0293186f3f10d209a8bc3e0d59743b
+  checksum: 4daa5546033aeec1a0c79f61fbf935e6d3f46bf7340711cb1bbc315bdfb2029c93ba847d888e1bfda8ecb8c94f6af0ceeae62e3828254f083d0c4e364125e211
   languageName: node
   linkType: hard
 
@@ -2125,6 +2125,7 @@ __metadata:
     "@babel/register": ^7.16.5
     "@babel/runtime": ^7.16.5
     "@polkadot/api": 7.0.3-3
+    "@polkadot/api-augment": 7.0.3-3
     "@polkadot/rpc-augment": 7.0.3-3
     "@polkadot/rpc-provider": 7.0.3-3
     "@polkadot/types": 7.0.3-3
@@ -9007,7 +9008,7 @@ resolve@^2.0.0-next.3:
     "@babel/core": ^7.16.5
     "@babel/register": ^7.16.5
     "@babel/runtime": ^7.16.5
-    "@polkadot/dev": ^0.64.13
+    "@polkadot/dev": ^0.64.14
     "@polkadot/ts": ^0.4.22
     "@polkadot/typegen": "workspace:packages/typegen"
     "@types/jest": ^27.0.3