diff --git a/dev/tool/src/gmail.ts b/dev/tool/src/gmail.ts
index b544017920..68d4e4a6e1 100644
--- a/dev/tool/src/gmail.ts
+++ b/dev/tool/src/gmail.ts
@@ -184,7 +184,7 @@ async function migrateGmailHistory (
     const history = db.collection<History>('histories')
     const allHistories = await history.find({}).toArray()
 
-    const kvsClient = getKvsClient(kvsUrl, token)
+    const kvsClient = getKvsClient('gmail', kvsUrl, token)
 
     for (const history of allHistories) {
       try {
diff --git a/models/core/src/migration.ts b/models/core/src/migration.ts
index 82efebbcfa..fe051851b9 100644
--- a/models/core/src/migration.ts
+++ b/models/core/src/migration.ts
@@ -267,7 +267,7 @@ async function processMigrateContentFor (
   }
 }
 
-async function migrateBackupMixins (client: MigrationClient): Promise<void> {
+export async function migrateBackupMixins (client: MigrationClient): Promise<void> {
   // Go via classes with domain and check if mixin exists and need to flush %hash%
   const hierarchy = client.hierarchy
   const curHash = Date.now().toString(16) // Current hash value
@@ -959,12 +959,13 @@ export const coreOperation: MigrateOperation = {
         state: 'accounts-to-social-ids',
         mode: 'upgrade',
         func: migrateAccounts
-      },
-      {
-        state: 'migrate-backup-mixins',
-        mode: 'upgrade',
-        func: migrateBackupMixins
       }
+      // ,
+      // {
+      //   state: 'migrate-backup-mixins',
+      //   mode: 'upgrade',
+      //   func: migrateBackupMixins
+      // }
     ])
   },
   async upgrade (state: Map<string, Set<string>>, client: () => Promise<MigrationUpgradeClient>, mode): Promise<void> {
diff --git a/plugins/love-resources/src/components/RoomPreview.svelte b/plugins/love-resources/src/components/RoomPreview.svelte
index c0cf39e67e..dca228bf30 100644
--- a/plugins/love-resources/src/components/RoomPreview.svelte
+++ b/plugins/love-resources/src/components/RoomPreview.svelte
@@ -89,7 +89,7 @@
     e.stopPropagation()
     e.preventDefault()
     if (person !== undefined) {
-      if ($myInfo === undefined) return
+      if ($myInfo === undefined || (person._id === me && $myInfo?.room === room._id)) return
       showPopup(PersonActionPopup, { room, person: person._id }, eventToHTMLElement(e))
     } else {
       await openRoom(x, y)
diff --git a/server/datalake/src/index.ts b/server/datalake/src/index.ts
index ba425e859f..ace5e19b4b 100644
--- a/server/datalake/src/index.ts
+++ b/server/datalake/src/index.ts
@@ -118,7 +118,7 @@ export class DatalakeService implements StorageAdapter {
                 size: (typeof blob.size === 'string' ? parseInt(blob.size) : blob.size) ?? 0,
                 provider: this.opt.name,
                 space: core.space.Configuration,
-                modifiedBy: core.account.ConfigUser,
+                modifiedBy: core.account.System,
                 modifiedOn: 0
               })
             }
diff --git a/server/minio/src/index.ts b/server/minio/src/index.ts
index e9d949b147..a83ca3e91d 100644
--- a/server/minio/src/index.ts
+++ b/server/minio/src/index.ts
@@ -235,7 +235,7 @@ export class MinioService implements StorageAdapter {
                   size: data.size,
                   provider: this.opt.name,
                   space: core.space.Configuration,
-                  modifiedBy: core.account.ConfigUser,
+                  modifiedBy: core.account.System,
                   modifiedOn: data.lastModified.getTime()
                 })
               }
diff --git a/server/s3/src/index.ts b/server/s3/src/index.ts
index 7e514e3d8d..136a46da45 100644
--- a/server/s3/src/index.ts
+++ b/server/s3/src/index.ts
@@ -288,7 +288,7 @@ export class S3Service implements StorageAdapter {
                 size: data.Size ?? 0,
                 provider: this.opt.name,
                 space: core.space.Configuration,
-                modifiedBy: core.account.ConfigUser,
+                modifiedBy: core.account.System,
                 modifiedOn: data.LastModified?.getTime() ?? 0
               })
             }