diff --git a/src/client/tsconfig.json b/src/client/tsconfig.json
index f57118ff..18e1dcc1 100644
--- a/src/client/tsconfig.json
+++ b/src/client/tsconfig.json
@@ -5,14 +5,12 @@
         "outDir": "../../dist",
         "skipLibCheck": true,
         "target": "ES2022",
-        "module": "ES2022",
 
         // Overrides
         "lib": ["ES2022", "DOM", "DOM.Iterable"],
-        "moduleResolution": "bundler",
-//        "allowImportingTsExtensions": true,
+        "module": "CommonJS",
+        "moduleResolution": "node",
         "allowSyntheticDefaultImports": true,
-        "resolveJsonModule": true
     },
     "include": [
         "../common/**/*.ts",
diff --git a/src/server/managers/database.ts b/src/server/managers/database.ts
index adeaf044..0671baf1 100644
--- a/src/server/managers/database.ts
+++ b/src/server/managers/database.ts
@@ -90,8 +90,6 @@ function _buildConfig() : DBConfig
         config.pool.afterCreate = newAfterCreate;
     }
 
-    logger.debug('Database config:', config);
-
     return config;
 }
 
diff --git a/src/server/server.ts b/src/server/server.ts
index f75b6c99..ac007c22 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -209,7 +209,6 @@ async function main() : Promise<{ app : Express, sio : any, server : any }>
 
         if(program.args.includes('--dev'))
         {
-            logger.warn('Should launch vite...');
             actualPort += 1;
 
             // Start Vite Dev Server
diff --git a/src/server/systems/eote/system.ts b/src/server/systems/eote/system.ts
index 25c9b37b..55cd22ae 100644
--- a/src/server/systems/eote/system.ts
+++ b/src/server/systems/eote/system.ts
@@ -17,7 +17,7 @@ import { validateEoteDetails, validateGenesysDetails } from './validations';
 
 // Logger
 import logging from '@strata-js/util-logging';
-const logger = logging.getLogger(module.filename);
+const logger = logging.getLogger('eote-system');
 
 //----------------------------------------------------------------------------------------------------------------------
 // System definition
diff --git a/src/server/systems/fate/system.ts b/src/server/systems/fate/system.ts
index c27f8521..2348488b 100644
--- a/src/server/systems/fate/system.ts
+++ b/src/server/systems/fate/system.ts
@@ -10,7 +10,7 @@ import defaults from './defaults';
 
 // Logger
 import logging from '@strata-js/util-logging';
-const logger = logging.getLogger(module.filename);
+const logger = logging.getLogger('fate-system');
 
 //----------------------------------------------------------------------------------------------------------------------
 // System definition
diff --git a/src/server/systems/risus/system.ts b/src/server/systems/risus/system.ts
index b12ba37a..cd9333d4 100644
--- a/src/server/systems/risus/system.ts
+++ b/src/server/systems/risus/system.ts
@@ -10,7 +10,7 @@ import defaults from './defaults';
 
 // Logger
 import logging from '@strata-js/util-logging';
-const logger = logging.getLogger(module.filename);
+const logger = logging.getLogger('risus-system');
 
 //----------------------------------------------------------------------------------------------------------------------
 // System definition
diff --git a/src/server/systems/wfrp/system.ts b/src/server/systems/wfrp/system.ts
index 8b155113..f8b8c07b 100644
--- a/src/server/systems/wfrp/system.ts
+++ b/src/server/systems/wfrp/system.ts
@@ -13,7 +13,7 @@ import defaults from './defaults';
 
 // Logger
 import logging from '@strata-js/util-logging';
-const logger = logging.getLogger(module.filename);
+const logger = logging.getLogger('wfrp-system');
 
 //----------------------------------------------------------------------------------------------------------------------
 // System definition
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
index 1726399d..caa3bee0 100644
--- a/src/server/tsconfig.json
+++ b/src/server/tsconfig.json
@@ -1,9 +1,9 @@
 {
     "compilerOptions": {
         "composite": true,
-        "target": "ES2022",
         "rootDir": "..",
         "outDir": "../../dist",
+        "target": "ES2022",
         "skipLibCheck": true,
 
         // Overrides
diff --git a/tsconfig.json b/tsconfig.json
index b52fea8b..16aca2ff 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,10 +1,10 @@
 {
     "compilerOptions": {
         "useDefineForClassFields": true,
-        "target": "ES2022",
-        "module": "ES2022",
         "lib": [ "ES2022", "DOM", "DOM.Iterable" ],
         "skipLibCheck": true,
+        "target": "ES2022",
+        "module": "ES2022",
 
         /* Bundler mode */
         "moduleResolution": "bundler",