diff --git a/packages/plugin-cloud-storage/src/adapters/azure/staticHandler.ts b/packages/plugin-cloud-storage/src/adapters/azure/staticHandler.ts
index 9ced1dbdd..1b4e3b509 100644
--- a/packages/plugin-cloud-storage/src/adapters/azure/staticHandler.ts
+++ b/packages/plugin-cloud-storage/src/adapters/azure/staticHandler.ts
@@ -18,7 +18,9 @@ export const getHandler = ({ collection, getStorageClient }: Args): StaticHandle
     try {
       const prefix = await getFilePrefix({ collection, req })
       const blockBlobClient = getStorageClient().getBlockBlobClient(
-        path.posix.join(prefix, req.params.filename),
+        // WARNING:
+        // TODO: Untested for 3.0
+        path.posix.join(prefix, req.routeParams.filename as string),
       )
 
       const { end, start } = await getRangeFromHeader(blockBlobClient, req.headers.range)
diff --git a/packages/plugin-cloud-storage/src/adapters/gcs/staticHandler.ts b/packages/plugin-cloud-storage/src/adapters/gcs/staticHandler.ts
index e3add6d03..4335c989c 100644
--- a/packages/plugin-cloud-storage/src/adapters/gcs/staticHandler.ts
+++ b/packages/plugin-cloud-storage/src/adapters/gcs/staticHandler.ts
@@ -19,7 +19,9 @@ export const getHandler = ({ bucket, collection, getStorageClient }: Args): Stat
       const prefix = await getFilePrefix({ collection, req })
       const file = getStorageClient()
         .bucket(bucket)
-        .file(path.posix.join(prefix, req.params.filename))
+        // WARNING:
+        // TODO: Untested for 3.0
+        .file(path.posix.join(prefix, req.routeParams.filename as string))
 
       const [metadata] = await file.getMetadata()
 
diff --git a/packages/plugin-cloud-storage/src/adapters/s3/staticHandler.ts b/packages/plugin-cloud-storage/src/adapters/s3/staticHandler.ts
index fd0d069ca..edbd657a7 100644
--- a/packages/plugin-cloud-storage/src/adapters/s3/staticHandler.ts
+++ b/packages/plugin-cloud-storage/src/adapters/s3/staticHandler.ts
@@ -21,7 +21,9 @@ export const getHandler = ({ bucket, collection, getStorageClient }: Args): Stat
 
       const object = await getStorageClient().getObject({
         Bucket: bucket,
-        Key: path.posix.join(prefix, req.params.filename),
+        // WARNING:
+        // TODO: Untested for 3.0
+        Key: path.posix.join(prefix, req.routeParams.filename as string),
       })
 
       res.set({
diff --git a/packages/plugin-cloud/src/staticHandler.ts b/packages/plugin-cloud/src/staticHandler.ts
index fa4398966..c020bfdc0 100644
--- a/packages/plugin-cloud/src/staticHandler.ts
+++ b/packages/plugin-cloud/src/staticHandler.ts
@@ -36,7 +36,7 @@ export const getStaticHandler = ({ cachingOptions, collection }: Args): StaticHa
         collection: collection.slug,
         // WARNING:
         // TODO: Untested for 3.0
-        filename: req.file.name,
+        filename: req.routeParams.filename as string,
         identityID,
       })
 
diff --git a/packages/richtext-slate/src/field/elements/getCommonBlock.tsx b/packages/richtext-slate/src/field/elements/getCommonBlock.tsx
index 1e11ea4b9..a02a39e58 100644
--- a/packages/richtext-slate/src/field/elements/getCommonBlock.tsx
+++ b/packages/richtext-slate/src/field/elements/getCommonBlock.tsx
@@ -11,8 +11,6 @@ export const getCommonBlock = (editor: Editor, match?: NodeMatch<Node>): NodeEnt
 
   const [common, path] = Node.common(editor, range.anchor.path, range.focus.path)
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error
   if (isBlockElement(editor, common) || Editor.isEditor(common)) {
     return [common, path]
   }