diff --git a/meshcentral.js b/meshcentral.js
index 16fe6961..90248d8d 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -4060,7 +4060,8 @@ function mainStart() {
         if ((typeof config.settings.webpush == 'object') && (typeof config.settings.webpush.email == 'string')) { modules.push('web-push'); }
 
         // Firebase Support
-        if (config.firebase != null) { modules.push('node-xcs'); }
+        // Avoid 0.1.8 due to bugs: https://github.com/guness/node-xcs/issues/43
+        if (config.firebase != null) { modules.push('node-xcs@0.1.7'); }
 
         // Syslog support
         if ((require('os').platform() != 'win32') && (config.settings.syslog || config.settings.syslogjson)) { modules.push('modern-syslog'); }
diff --git a/package.json b/package.json
index 1549994f..2bfe1583 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "sample-config-advanced.json"
   ],
   "dependencies": {
+    "@yetzt/nedb": "^1.8.0",
     "archiver": "^5.3.1",
     "body-parser": "^1.19.0",
     "cbor": "~5.2.0",
@@ -47,9 +48,11 @@
     "express-ws": "^4.0.0",
     "ipcheck": "^0.1.0",
     "minimist": "^1.2.5",
+    "mongodb": "^4.9.1",
     "multiparty": "^4.2.1",
-    "@yetzt/nedb": "^1.8.0",
     "node-forge": "^1.0.0",
+    "node-xcs": "^0.1.7",
+    "saslprep": "^1.0.3",
     "ws": "^5.2.3",
     "yauzl": "^2.10.0"
   },