diff --git a/core/src/services/s3/core.rs b/core/src/services/s3/core.rs
index a49b0dab8251..ce8086c1ecb4 100644
--- a/core/src/services/s3/core.rs
+++ b/core/src/services/s3/core.rs
@@ -449,14 +449,14 @@ impl S3Core {
             req = req.header(CONTENT_TYPE, mime)
         }
 
-        if let Some(encoding) = args.content_encoding() {
-            req = req.header(CONTENT_ENCODING, encoding);
-        }
-
         if let Some(pos) = args.content_disposition() {
             req = req.header(CONTENT_DISPOSITION, pos)
         }
 
+        if let Some(encoding) = args.content_encoding() {
+            req = req.header(CONTENT_ENCODING, encoding);
+        }
+
         if let Some(cache_control) = args.cache_control() {
             req = req.header(CACHE_CONTROL, cache_control)
         }
diff --git a/core/src/types/operator/operator.rs b/core/src/types/operator/operator.rs
index 8046967b21b9..f2130c336ecf 100644
--- a/core/src/types/operator/operator.rs
+++ b/core/src/types/operator/operator.rs
@@ -1447,6 +1447,8 @@ impl Operator {
     ///
     /// ## `if_none_match`
     ///
+    /// Sets an `if none match` condition with specified ETag for this write request.
+    ///
     /// ### Capability
     ///
     /// Check [`Capability::write_with_if_none_match`] before using this feature.
diff --git a/core/tests/behavior/async_write.rs b/core/tests/behavior/async_write.rs
index e2375e69ed5a..5b0a08b89bad 100644
--- a/core/tests/behavior/async_write.rs
+++ b/core/tests/behavior/async_write.rs
@@ -218,7 +218,7 @@ pub async fn test_write_with_content_encoding(op: Operator) -> Result<()> {
         return Ok(());
     }
 
-    let (path, content, size) = TEST_FIXTURE.new_file(op.clone());
+    let (path, content, _) = TEST_FIXTURE.new_file(op.clone());
 
     let target_content_encoding = "gzip";
     op.write_with(&path, content)