diff --git a/lib/compute-schema.js b/lib/compute-schema.js
new file mode 100644
index 00000000..00b6d332
--- /dev/null
+++ b/lib/compute-schema.js
@@ -0,0 +1,10 @@
+const { asyncLocalStorage, defaultStore } = require('./async-storage')
+
+const computeSchema = (req, res, next) => {
+  const store = defaultStore()
+  asyncLocalStorage.run(store, () => {
+    next()
+  })
+}
+
+module.exports = computeSchema
diff --git a/lib/new-admin/middlewares/cleanUserSessions.js b/lib/new-admin/middlewares/cleanUserSessions.js
index c156c740..33cb5b04 100644
--- a/lib/new-admin/middlewares/cleanUserSessions.js
+++ b/lib/new-admin/middlewares/cleanUserSessions.js
@@ -11,8 +11,8 @@ const cleanUserSessions = (cleanInterval) => (req, res, next) => {
   if (!schema) return next()
   if (schema && schemaCache.schema + cleanInterval > now) return next()
 
-  console.log('Clearing old sessions for schema', schema)
-  return db.$none('DELETE FROM $1^ WHERE expire < to_timestamp($2)', [USER_SESSIONS_TABLE_NAME, now])
+  console.log('Clearing expired sessions for schema', schema)
+  return db.none('DELETE FROM $1^ WHERE expire < to_timestamp($2 / 1000.0)', [USER_SESSIONS_TABLE_NAME, now])
     .then(() => {
       schemaCache.schema = now
       return next()
diff --git a/lib/new-admin/middlewares/session.js b/lib/new-admin/middlewares/session.js
index dc0ba1fd..24d07dad 100644
--- a/lib/new-admin/middlewares/session.js
+++ b/lib/new-admin/middlewares/session.js
@@ -21,7 +21,7 @@ const getSecret = () => {
 const hostname = options.hostname
 
 const lamaDb = {
-  query: (query, values, qrm) => db.$query(query, values, qrm, false)
+  query: (query, values, qrm) => db.query(query, values, qrm, false)
 }
 
 router.use('*', session({