diff --git a/src/nixSupport/xce.nix b/src/nixSupport/xce.nix
index dbb36440..8dc6bd4f 100644
--- a/src/nixSupport/xce.nix
+++ b/src/nixSupport/xce.nix
@@ -32,10 +32,18 @@ stdenv.mkDerivation {
     capnpc
     which
     findutils
-    libuv
-    elogind
-    sqlite
-    hwloc
+    (libuv.overrideAttrs (oldAttrs: {
+      separateDebugInfo = true;
+    }))
+    (elogind.overrideAttrs (oldAttrs: {
+      separateDebugInfo = true;
+    }))
+    (sqlite.overrideAttrs (oldAttrs: {
+      separateDebugInfo = true;
+    }))
+    (hwloc.overrideAttrs (oldAttrs: {
+      separateDebugInfo = true;
+    }))
     linux-pam
     tinylog
     unity_test_with_color
diff --git a/src/worker/src/xcecd_db.c b/src/worker/src/xcecd_db.c
index 56fd3948..2aa7ca76 100644
--- a/src/worker/src/xcecd_db.c
+++ b/src/worker/src/xcecd_db.c
@@ -44,7 +44,10 @@ bool xcecd_db_init(xcecd_db_t** db,
         XCECD_LOG(XCE_LOG_ERROR, 
                   "Failed to open database: %s", 
                   sqlite3_errmsg(*db));
-        FREEUP(*db);
+        if ((*db) != NULL) {
+            sqlite3_close(*db);
+        }
+
         return false;
     }