diff --git a/apps/desktop/tsconfig.forge.json b/apps/desktop/tsconfig.forge.json
index 5fbd061acf..143f003e12 100644
--- a/apps/desktop/tsconfig.forge.json
+++ b/apps/desktop/tsconfig.forge.json
@@ -13,7 +13,8 @@
   },
   "include": [
     "**/*.ts",
-    "../server/src/*.d.ts"
+    "../server/src/*.d.ts",
+    "package.json"
   ],
   "exclude": [
     "eslint.config.js",
diff --git a/apps/edit-docs/src/edit-demo.ts b/apps/edit-docs/src/edit-demo.ts
index 2f058d6123..4f70a380e7 100644
--- a/apps/edit-docs/src/edit-demo.ts
+++ b/apps/edit-docs/src/edit-demo.ts
@@ -1,9 +1,9 @@
-import { extractZip, importData, initializeDatabase, startElectron } from "./utils.js";
-import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js";
 import debounce from "@triliumnext/client/src/services/debounce.js";
+import cls from "@triliumnext/server/src/services/cls.js";
 import fs from "fs/promises";
 import { join } from "path";
-import cls from "@triliumnext/server/src/services/cls.js";
+
+import { extractZip, importData, startElectron } from "./utils.js";
 
 // Paths are relative to apps/edit-docs/dist.
 const DEMO_ZIP_PATH = join(__dirname, "../../server/src/assets/db/demo.zip");
@@ -15,8 +15,7 @@ async function main() {
         setTimeout(() => registerHandlers(), 10_000);
     });
 
-    await initializeTranslations();
-    await initializeDatabase(true);
+    // TODO: Initialize core.
     cls.init(async () => {
         await importData(DEMO_ZIP_DIR_PATH);
         setOptions();
diff --git a/apps/edit-docs/src/edit-docs.ts b/apps/edit-docs/src/edit-docs.ts
index e35d217728..67a9ac06bb 100644
--- a/apps/edit-docs/src/edit-docs.ts
+++ b/apps/edit-docs/src/edit-docs.ts
@@ -121,8 +121,7 @@ async function main() {
         }, 10_000);
     });
 
-    await initializeTranslations();
-    await initializeDatabase(true);
+    // TODO: Initialize core.
 
     // Wait for becca to be loaded before importing data
     const { becca_loader: beccaLoader } = await import("@triliumnext/core");
diff --git a/apps/server/src/services/ws_messaging_provider.ts b/apps/server/src/services/ws_messaging_provider.ts
index 0896e8a906..a97c66a26a 100644
--- a/apps/server/src/services/ws_messaging_provider.ts
+++ b/apps/server/src/services/ws_messaging_provider.ts
@@ -24,7 +24,7 @@ export default class WebSocketMessagingProvider implements MessagingProvider {
     init(httpServer: HttpServer, sessionParser: express.RequestHandler) {
         this.webSocketServer = new WebSocketServer({
             verifyClient: (info, done) => {
-                sessionParser(info.req as express.Request, {}, () => {
+                sessionParser(info.req as express.Request, {} as express.Response, () => {
                     const allowed = isElectron || (info.req as any).session.loggedIn || (config.General && config.General.noAuthentication);
 
                     if (!allowed) {
diff --git a/apps/server/src/sql_provider.ts b/apps/server/src/sql_provider.ts
index da1604d44e..86adb5b2c9 100644
--- a/apps/server/src/sql_provider.ts
+++ b/apps/server/src/sql_provider.ts
@@ -44,7 +44,8 @@ export default class BetterSqlite3Provider implements DatabaseProvider {
 
     prepare(query: string): Statement {
         if (!this.dbConnection) throw new Error("DB not open.");
-        return this.dbConnection.prepare(query);
+        // Cast is safe: better-sqlite3 only returns bigint when safeIntegers() is enabled, which we don't use.
+        return this.dbConnection.prepare(query) as unknown as Statement;
     }
 
     transaction<T>(func: (statement: Statement) => T): Transaction {
diff --git a/packages/trilium-core/tsconfig.lib.json b/packages/trilium-core/tsconfig.lib.json
index 84c5a86535..3ae44d7205 100644
--- a/packages/trilium-core/tsconfig.lib.json
+++ b/packages/trilium-core/tsconfig.lib.json
@@ -12,7 +12,8 @@
     "types": []
   },
   "include": [
-    "src/**/*.ts"
+    "src/**/*.ts",
+    "src/**/*.json"
   ],
   "references": [],
   "exclude": [