diff --git a/server-ce/nginx/clsi-nginx.conf b/server-ce/nginx/clsi-nginx.conf
index 5ce22a3f56..a513039643 100644
--- a/server-ce/nginx/clsi-nginx.conf
+++ b/server-ce/nginx/clsi-nginx.conf
@@ -34,8 +34,8 @@ server {
     root /var/lib/overleaf/data/output/$1-$2/generated-files/$3/;
   }
   # handle output files for anonymous users
-  location ~ ^/project/([0-9a-f]+)/build/([0-9a-f-]+)/output/(.+)$ {
-    rewrite ^/project/([0-9a-f]+)/build/([0-9a-f-]+)/output/(.+)$ /$3 break;
+  location ~ ^/project/([0-9a-f-]+)/build/([0-9a-f-]+)/output/(.+)$ {
+    rewrite ^/project/([0-9a-f-]+)/build/([0-9a-f-]+)/output/(.+)$ /$3 break;
     root /var/lib/overleaf/data/output/$1/generated-files/$2/;
   }
 
diff --git a/services/clsi/app/js/DockerRunner.mjs b/services/clsi/app/js/DockerRunner.mjs
index c578b3974d..e15540e8a1 100644
--- a/services/clsi/app/js/DockerRunner.mjs
+++ b/services/clsi/app/js/DockerRunner.mjs
@@ -200,6 +200,7 @@ const DockerRunner = {
               err.code = exitCode
               return callback(err)
             }
+            output.exitCode = exitCode
             containerReturned = true
             logger.debug(
               // The seccomp policy is very large. Avoid logging it. _.omit deep clones.
diff --git a/services/clsi/seccomp/clsi-profile.json b/services/clsi/seccomp/clsi-profile.json
index 0a89877ead..5c1ba14239 100644
--- a/services/clsi/seccomp/clsi-profile.json
+++ b/services/clsi/seccomp/clsi-profile.json
@@ -861,19 +861,29 @@
             "args": []
         },
         {
-            "name": "openat2",
+            "name": "epoll_create",
             "action": "SCMP_ACT_ALLOW",
             "args": []
         },
         {
-            "name": "statx",
+            "name": "epoll_ctl",
             "action": "SCMP_ACT_ALLOW",
             "args": []
         },
         {
-            "name": "clone3",
+            "name": "timerfd_create",
             "action": "SCMP_ACT_ALLOW",
-             "args": []
+            "args": []
+        },
+        {
+            "name": "timerfd_settime",
+            "action": "SCMP_ACT_ALLOW",
+            "args": []
+        },
+        {
+            "name": "eventfd2",
+            "action": "SCMP_ACT_ALLOW",
+            "args": []
         }
     ]
 }
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index c1b6b218aa..673070b461 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -1263,6 +1263,16 @@ module.exports = {
   },
 
   splitTestOverrides: {
+    ...(process.env.ENABLE_EDITOR_TABS?.toLowerCase() === 'true' ? {
+      'editor-tabs': 'enabled',
+    } : {}),
+    ...(process.env.ENABLE_PANDOC_CONVERSIONS === 'true' ? {
+      'import-docx': 'enabled',
+      'import-markdown': 'enabled',
+      'export-docx': 'enabled',
+      'export-html': 'enabled',
+      'export-markdown': 'enabled',
+    } : {}),
     ...(process.env.OVERLEAF_HISTORY_RESTORE?.toLowerCase() === 'true' ? {
       'history-ranges-support': 'enabled',
       'revert-file': 'enabled',