diff --git a/packages/cli-tools/bin/streamr-stream-subscribe.ts b/packages/cli-tools/bin/streamr-stream-subscribe.ts
index 91cba91eaf..379f5afc75 100755
--- a/packages/cli-tools/bin/streamr-stream-subscribe.ts
+++ b/packages/cli-tools/bin/streamr-stream-subscribe.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import '../src/logLevel'
 
-import { convertStreamMessageToBytes, MessageMetadata, StreamMessage, StreamrClient } from '@streamr/sdk'
+import { convertStreamMessageToBytes, MessageMetadata, type StreamMessage, StreamrClient } from '@streamr/sdk'
 import { binaryToHex, toLengthPrefixedFrame } from '@streamr/utils'
 import mapValues from 'lodash/mapValues'
 import isString from 'lodash/isString'
diff --git a/packages/cli-tools/package.json b/packages/cli-tools/package.json
index 57ceb3aec2..73f4d4e5fd 100644
--- a/packages/cli-tools/package.json
+++ b/packages/cli-tools/package.json
@@ -17,7 +17,7 @@
     "streamr": "dist/bin/streamr.js"
   },
   "scripts": {
-    "build": "tsc -b tsconfig.node.json",
+    "build": "tsc -b",
     "check": "tsc -p ./tsconfig.jest.json",
     "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
diff --git a/packages/cli-tools/tsconfig.jest.json b/packages/cli-tools/tsconfig.jest.json
index 4ef50a23f1..0e2fa7be19 100644
--- a/packages/cli-tools/tsconfig.jest.json
+++ b/packages/cli-tools/tsconfig.jest.json
@@ -1,13 +1,24 @@
 {
   "extends": "../../tsconfig.jest.json",
   "compilerOptions": {
-    "noEmit": true,
-    "types": ["node", "jest", "@streamr/test-utils/customMatcherTypes"],
+    "types": [
+      "node",
+      "jest",
+      "@streamr/test-utils/customMatcherTypes"
+    ],
     "noImplicitOverride": false
   },
   "include": [
+    "package.json",
     "src",
     "bin",
     "test"
+  ],
+  "references": [
+    { "path": "../utils/tsconfig.node.json" },
+    { "path": "../sdk/tsconfig.node.json" },
+    { "path": "../dht/tsconfig.node.json" },
+    { "path": "../trackerless-network/tsconfig.node.json" },
+    { "path": "../test-utils/tsconfig.node.json" }
   ]
 }
diff --git a/packages/cli-tools/tsconfig.json b/packages/cli-tools/tsconfig.json
index 8f24c2e23c..86445ab0b2 100644
--- a/packages/cli-tools/tsconfig.json
+++ b/packages/cli-tools/tsconfig.json
@@ -4,6 +4,7 @@
     "composite": true
   },
   "references": [
+    { "path": "./tsconfig.node.json" },
     { "path": "./tsconfig.jest.json" }
   ]
 }
diff --git a/packages/cli-tools/tsconfig.node.json b/packages/cli-tools/tsconfig.node.json
index 0961dc9550..5bf8495842 100644
--- a/packages/cli-tools/tsconfig.node.json
+++ b/packages/cli-tools/tsconfig.node.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.node.json",
   "compilerOptions": {
-    "composite": true,
     "outDir": "dist"
   },
   "include": [
@@ -11,6 +10,8 @@
   ],
   "references": [
     { "path": "../utils/tsconfig.node.json" },
-    { "path": "../sdk/tsconfig.node.json" }
+    { "path": "../sdk/tsconfig.node.json" },
+    { "path": "../dht/tsconfig.node.json" },
+    { "path": "../trackerless-network/tsconfig.node.json" }
   ]
 }
diff --git a/tsconfig.node.json b/tsconfig.node.json
index 7c203c2d4d..afc8e344ec 100644
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -14,7 +14,8 @@
     "sourceMap": true,
     "stripInternal": true,
     "useUnknownInCatchVariables": false,
-    "strictBindCallApply": true
+    "strictBindCallApply": true,
+    "disableSourceOfProjectReferenceRedirect": true
   }, 
   "lib": [
     "DOM"