diff --git a/async-nats/src/jetstream/object_store/mod.rs b/async-nats/src/jetstream/object_store/mod.rs
index eb70c3991..db1b9d6cc 100644
--- a/async-nats/src/jetstream/object_store/mod.rs
+++ b/async-nats/src/jetstream/object_store/mod.rs
@@ -550,6 +550,7 @@ impl ObjectStore {
     ///         object_store::UpdateMetadata {
     ///             name: "new_name".to_string(),
     ///             description: Some("a new description".to_string()),
+    ///             ..Default::default()
     ///         },
     ///     )
     ///     .await?;
@@ -1128,6 +1129,11 @@ pub struct UpdateMetadata {
     pub name: String,
     /// A short human readable description of the object.
     pub description: Option<String>,
+    /// Metadata for given object.
+    #[serde(default)]
+    pub metadata: HashMap<String, String>,
+    /// Headers for given object.
+    pub headers: Option<HeaderMap>,
 }
 
 /// Meta information about an object.
@@ -1140,6 +1146,7 @@ pub struct ObjectMetadata {
     /// Max chunk size. Default is 128k.
     pub chunk_size: Option<usize>,
     /// Metadata for given object.
+    #[serde(default)]
     pub metadata: HashMap<String, String>,
     /// Headers for given object.
     pub headers: Option<HeaderMap>,
diff --git a/async-nats/tests/kv_tests.rs b/async-nats/tests/kv_tests.rs
index 05d9d3567..b9a62c616 100644
--- a/async-nats/tests/kv_tests.rs
+++ b/async-nats/tests/kv_tests.rs
@@ -984,6 +984,9 @@ mod kv {
         assert_eq!("bar.$KV.test.key", message.subject.as_str());
     }
 
+    // This test if flaky due to its assumptions.
+    // It is set to ignored until those are resolved.
+    #[ignore]
     #[tokio::test]
     async fn cross_account_mirrors() {
         let hub_server = nats_server::run_server("tests/configs/jetstream_hub.conf");
diff --git a/async-nats/tests/object_store.rs b/async-nats/tests/object_store.rs
index 4d319a07a..d2d588564 100644
--- a/async-nats/tests/object_store.rs
+++ b/async-nats/tests/object_store.rs
@@ -478,6 +478,7 @@ mod object_store {
         let given_metadata = UpdateMetadata {
             name: "new_object".to_owned(),
             description: Some("description".to_string()),
+            ..Default::default()
         };
 
         bucket