diff --git a/package-lock.json b/package-lock.json
index 9a51b7ed5..812a7d5f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3165,7 +3165,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
       "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "event-target-shim": "^5.0.0"
@@ -6305,7 +6304,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
       "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
diff --git a/packages/core-orders/src/module/configureOrderDeliveriesModule.ts b/packages/core-orders/src/module/configureOrderDeliveriesModule.ts
index 27752a618..8774e1add 100644
--- a/packages/core-orders/src/module/configureOrderDeliveriesModule.ts
+++ b/packages/core-orders/src/module/configureOrderDeliveriesModule.ts
@@ -1,9 +1,9 @@
-import { mongodb, generateDbFilterById, generateDbMutations } from '@unchainedshop/mongodb';
+import { mongodb, generateDbFilterById, generateDbObjectId } from '@unchainedshop/mongodb';
 import { emit, registerEvents } from '@unchainedshop/events';
 import { Order, OrderDelivery, OrderDeliveryStatus, OrderDiscount } from '../types.js';
 import { DeliveryDirector, DeliveryLocation, IDeliveryPricingSheet } from '@unchainedshop/core-delivery';
 import { OrderPricingDiscount } from '../director/OrderPricingDirector.js';
-import { ModuleMutations, UnchainedCore } from '@unchainedshop/core';
+import { UnchainedCore } from '@unchainedshop/core';
 
 export type OrderDeliveriesModule = {
   // Queries
diff --git a/packages/core-users/src/module/configureUsersModule.ts b/packages/core-users/src/module/configureUsersModule.ts
index 9d148c814..b540ba02b 100644
--- a/packages/core-users/src/module/configureUsersModule.ts
+++ b/packages/core-users/src/module/configureUsersModule.ts
@@ -19,6 +19,9 @@ import * as pbkdf2 from './pbkdf2.js';
 import * as sha256 from './sha256.js';
 import type { Address, Contact } from '@unchainedshop/mongodb';
 import crypto from 'crypto';
+import { UnchainedCore } from '@unchainedshop/core';
+import { UserServices } from '../users-index.js';
+import { FileServices, FilesModule } from '@unchainedshop/core-files';
 
 const isDate = (value) => {
   const date = new Date(value);