diff --git a/src/equicordplugins/fixFileExtensions/index.tsx b/src/equicordplugins/fixFileExtensions/index.tsx
index 9e3fd34d..85d15030 100644
--- a/src/equicordplugins/fixFileExtensions/index.tsx
+++ b/src/equicordplugins/fixFileExtensions/index.tsx
@@ -41,15 +41,6 @@ export default definePlugin({
             },
             predicate: () => !Settings.plugins.AnonymiseFileNames.enabled,
         },
-        // Also taken from AnonymiseFileNames
-        {
-            find: 'addFilesTo:"message.attachments"',
-            replacement: {
-                match: /(\i.uploadFiles\((\i),)/,
-                replace: "$2.forEach(f=>f.filename=$self.fixExt(f)),$1",
-            },
-            predicate: () => !Settings.plugins.AnonymiseFileNames.enabled,
-        }
     ],
     fixExt(upload: ExtUpload) {
         const file = upload.filename;
diff --git a/src/plugins/anonymiseFileNames/index.tsx b/src/plugins/anonymiseFileNames/index.tsx
index 84b42518..d835d154 100644
--- a/src/plugins/anonymiseFileNames/index.tsx
+++ b/src/plugins/anonymiseFileNames/index.tsx
@@ -85,13 +85,6 @@ export default definePlugin({
                 replace: "$1.forEach($self.anonymise),$&"
             },
         },
-        {
-            find: 'addFilesTo:"message.attachments"',
-            replacement: {
-                match: /\i.uploadFiles\((\i),/,
-                replace: "$1.forEach($self.anonymise),$&"
-            }
-        },
         {
             find: "#{intl::ATTACHMENT_UTILITIES_SPOILER}",
             replacement: {
diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index aee65252..41a5552c 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -133,7 +133,7 @@ export default definePlugin({
         {
             find: "Copy image not supported",
             replacement: {
-                match: /(?<=(?:canSaveImage|canCopyImage)\(\i?\)\{.{0,50})!\i\.isPlatformEmbedded/g,
+                match: /(?<=(?:canSaveImage|canCopyImage)\((\i,\i)?\)\{.{0,150})!\i\.isPlatformEmbedded/g,
                 replace: "false"
             }
         },
@@ -147,7 +147,7 @@ export default definePlugin({
                     replace: "false"
                 },
                 {
-                    match: /return\s*?\[.{0,50}?(?=\?.{0,100}?id:"copy-image")/,
+                    match: /return\s*?\[.{0,50}?(?=\?.{0,25}?id:"copy-image")/,
                     replace: "return [true"
                 },
                 {