diff --git a/identity_credential/src/revocation/status_list_2021/credential.rs b/identity_credential/src/revocation/status_list_2021/credential.rs
index cc52916967..e2ef0950cd 100644
--- a/identity_credential/src/revocation/status_list_2021/credential.rs
+++ b/identity_credential/src/revocation/status_list_2021/credential.rs
@@ -279,7 +279,11 @@ impl StatusList2021CredentialSubject {
       return Err(StatusList2021CredentialError::MultipleCredentialSubject);
     };
     if let Some(subject_type) = subject.properties.get("type") {
-      if !subject_type.as_str().is_some_and(|t| t == CREDENTIAL_SUBJECT_TYPE) {
+      if !subject_type
+        .as_str()
+        .map(|t| t == CREDENTIAL_SUBJECT_TYPE)
+        .unwrap_or(false)
+      {
         return Err(StatusList2021CredentialError::InvalidProperty("credentialSubject.type"));
       }
     } else {
diff --git a/identity_jose/src/jwk/key_params.rs b/identity_jose/src/jwk/key_params.rs
index ba3ca23059..9d1437637a 100644
--- a/identity_jose/src/jwk/key_params.rs
+++ b/identity_jose/src/jwk/key_params.rs
@@ -105,6 +105,12 @@ pub struct JwkParamsEc {
   pub d: Option<String>, // ECC Private Key
 }
 
+impl Default for JwkParamsEc {
+  fn default() -> Self {
+    Self::new()
+  }
+}
+
 impl JwkParamsEc {
   /// Creates new JWK EC Params.
   pub const fn new() -> Self {
@@ -251,6 +257,12 @@ pub struct JwkParamsRsaPrime {
   pub t: String, // Factor CRT Coefficient
 }
 
+impl Default for JwkParamsRsa {
+  fn default() -> Self {
+    Self::new()
+  }
+}
+
 impl JwkParamsRsa {
   /// Creates new JWK RSA Params.
   pub const fn new() -> Self {
@@ -333,6 +345,12 @@ pub struct JwkParamsOct {
   pub k: String, // Key Value
 }
 
+impl Default for JwkParamsOct {
+  fn default() -> Self {
+    Self::new()
+  }
+}
+
 impl JwkParamsOct {
   /// Creates new JWK Oct Params.
   pub const fn new() -> Self {
@@ -382,6 +400,12 @@ pub struct JwkParamsOkp {
   pub d: Option<String>, // Private Key
 }
 
+impl Default for JwkParamsOkp {
+  fn default() -> Self {
+    Self::new()
+  }
+}
+
 impl JwkParamsOkp {
   /// Creates new JWK OKP Params.
   pub const fn new() -> Self {
diff --git a/identity_jose/src/jwt/header.rs b/identity_jose/src/jwt/header.rs
index 631bd151c3..ca87211c84 100644
--- a/identity_jose/src/jwt/header.rs
+++ b/identity_jose/src/jwt/header.rs
@@ -105,6 +105,12 @@ pub struct JwtHeader {
   nonce: Option<String>,
 }
 
+impl Default for JwtHeader {
+  fn default() -> Self {
+    Self::new()
+  }
+}
+
 impl JwtHeader {
   /// Create a new `JwtHeader`.
   pub const fn new() -> Self {
diff --git a/identity_jose/src/jwu/serde.rs b/identity_jose/src/jwu/serde.rs
index a5e6c1f84d..cd80a1c949 100644
--- a/identity_jose/src/jwu/serde.rs
+++ b/identity_jose/src/jwu/serde.rs
@@ -24,10 +24,10 @@ pub(crate) fn parse_utf8(slice: &(impl AsRef<[u8]> + ?Sized)) -> Result<&str> {
   str::from_utf8(slice.as_ref()).map_err(Error::InvalidUtf8)
 }
 
-pub(crate) fn filter_non_empty_bytes<'a, T, U: 'a>(value: T) -> Option<&'a [u8]>
+pub(crate) fn filter_non_empty_bytes<'a, T, U>(value: T) -> Option<&'a [u8]>
 where
   T: Into<Option<&'a U>>,
-  U: AsRef<[u8]> + ?Sized,
+  U: AsRef<[u8]> + ?Sized + 'a,
 {
   value.into().map(AsRef::as_ref).filter(|value| !value.is_empty())
 }
diff --git a/identity_storage/src/key_storage/bls.rs b/identity_storage/src/key_storage/bls.rs
index 0dfb342a92..f828f28ea7 100644
--- a/identity_storage/src/key_storage/bls.rs
+++ b/identity_storage/src/key_storage/bls.rs
@@ -71,7 +71,12 @@ pub fn expand_bls_jwk(jwk: &Jwk) -> KeyStorageResult<(Option<BBSplusSecretKey>,
   let params = jwk
     .try_ec_params()
     .ok()
-    .filter(|params| params.try_bls_curve().is_ok_and(|curve| curve == BlsCurve::BLS12381G2))
+    .filter(|params| {
+      params
+        .try_bls_curve()
+        .map(|curve| curve == BlsCurve::BLS12381G2)
+        .unwrap_or(false)
+    })
     .context(format!("not a {} curve key", BlsCurve::BLS12381G2))
     .map_err(|e| KeyStorageError::new(KeyStorageErrorKind::UnsupportedKeyType).with_source(e))?;
 
diff --git a/identity_storage/src/key_storage/ed25519.rs b/identity_storage/src/key_storage/ed25519.rs
index c8750e1f39..8e807af6c9 100644
--- a/identity_storage/src/key_storage/ed25519.rs
+++ b/identity_storage/src/key_storage/ed25519.rs
@@ -53,6 +53,6 @@ pub(crate) fn encode_jwk(private_key: &SecretKey, public_key: &crypto::signature
   let mut params = JwkParamsOkp::new();
   params.x = x;
   params.d = Some(d);
-  params.crv = EdCurve::Ed25519.name().to_owned();
+  EdCurve::Ed25519.name().clone_into(&mut params.crv);
   Jwk::from_params(params)
 }
diff --git a/identity_storage/src/key_storage/memstore.rs b/identity_storage/src/key_storage/memstore.rs
index 036f92ce7c..e1f463705d 100644
--- a/identity_storage/src/key_storage/memstore.rs
+++ b/identity_storage/src/key_storage/memstore.rs
@@ -366,7 +366,8 @@ mod bbs_plus_impl {
       // Check the provided JWK represents a BLS12381G2 key.
       if !public_key
         .try_ec_params()
-        .is_ok_and(|ec| ec.crv == BlsCurve::BLS12381G2.to_string())
+        .map(|ec| ec.crv == BlsCurve::BLS12381G2.to_string())
+        .unwrap_or(false)
       {
         return Err(
           KeyStorageError::new(KeyStorageErrorKind::UnsupportedKeyType)
@@ -401,7 +402,8 @@ mod bbs_plus_impl {
       // Check the provided JWK represents a BLS12381G2 key.
       if !public_key
         .try_ec_params()
-        .is_ok_and(|ec| ec.crv == BlsCurve::BLS12381G2.to_string())
+        .map(|ec| ec.crv == BlsCurve::BLS12381G2.to_string())
+        .unwrap_or(false)
       {
         return Err(
           KeyStorageError::new(KeyStorageErrorKind::UnsupportedKeyType)
diff --git a/identity_stronghold/src/storage/mod.rs b/identity_stronghold/src/storage/mod.rs
index 7ad8b26ffa..cb02b9274b 100644
--- a/identity_stronghold/src/storage/mod.rs
+++ b/identity_stronghold/src/storage/mod.rs
@@ -87,7 +87,7 @@ impl StrongholdStorage {
 
     let mut params = JwkParamsOkp::new();
     params.x = jwu::encode_b64(public_key);
-    params.crv = EdCurve::Ed25519.name().to_owned();
+    EdCurve::Ed25519.name().clone_into(&mut params.crv);
     let mut jwk: Jwk = Jwk::from_params(params);
     jwk.set_alg(JwsAlgorithm::EdDSA.name());
     jwk.set_kid(jwk.thumbprint_sha256_b64());
@@ -153,7 +153,7 @@ impl StrongholdStorage {
 
     let mut params = JwkParamsOkp::new();
     params.x = jwu::encode_b64(public_key);
-    params.crv = EdCurve::Ed25519.name().to_owned();
+    EdCurve::Ed25519.name().clone_into(&mut params.crv);
     let mut jwk: Jwk = Jwk::from_params(params);
     jwk.set_alg(JwsAlgorithm::EdDSA.name());
     jwk.set_kid(jwk.thumbprint_sha256_b64());
diff --git a/identity_stronghold/src/storage/stronghold_jwk_storage.rs b/identity_stronghold/src/storage/stronghold_jwk_storage.rs
index 1ab55225fc..63535293b1 100644
--- a/identity_stronghold/src/storage/stronghold_jwk_storage.rs
+++ b/identity_stronghold/src/storage/stronghold_jwk_storage.rs
@@ -85,7 +85,7 @@ impl JwkStorage for StrongholdStorage {
 
     let mut params = JwkParamsOkp::new();
     params.x = jwu::encode_b64(public_key);
-    params.crv = EdCurve::Ed25519.name().to_owned();
+    EdCurve::Ed25519.name().clone_into(&mut params.crv);
     let mut jwk: Jwk = Jwk::from_params(params);
     jwk.set_alg(alg.name());
     jwk.set_kid(jwk.thumbprint_sha256_b64());