diff --git a/Cargo.toml b/Cargo.toml
index fa3a231d..30add47d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,8 +20,9 @@ crate-type = ["staticlib", "rlib", "cdylib"]
 
 [features]
 default = ["ffi", "logger", "zeroize"]
-ffi = ["ffi-support"]
-logger = ["env_logger"]
+ffi = ["dep:ffi-support"]
+zeroize = ["dep:zeroize"]
+logger = ["dep:env_logger"]
 vendored = ["anoncreds-clsignatures/openssl_vendored"]
 
 [dependencies]
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index f4d881fa..7def94ac 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -9,7 +9,7 @@
 | Name             | Github           | LFID             |
 | ---------------- | ---------------- | ---------------- |
 | Andrew Whitehead | andrewwhitehead  | cywolf           |
-| Berend Sliedrecht| blu3beri         | beri14           |
+| Berend Sliedrecht| berendsliedrecht | beri14           |
 | Darko Kulic      | dkulic           | dkulic           |
 | Stephen Curran   | swcurran         | swcurran         |
 | Timo Glastra     | TimoGlastra      | TimoGlastra      |
diff --git a/src/ffi/credential.rs b/src/ffi/credential.rs
index 0855650e..306a455c 100644
--- a/src/ffi/credential.rs
+++ b/src/ffi/credential.rs
@@ -9,10 +9,10 @@ use super::util::FfiStrList;
 use crate::data_types::link_secret::LinkSecret;
 use crate::error::Result;
 use crate::services::{
+    helpers::encode_credential_attribute,
     issuer::create_credential,
     prover::process_credential,
     types::{Credential, CredentialRevocationConfig, MakeCredentialValues},
-    utils::encode_credential_attribute,
 };
 use crate::Error;
 
diff --git a/src/services/mod.rs b/src/services/mod.rs
index 8261db6e..3458282c 100644
--- a/src/services/mod.rs
+++ b/src/services/mod.rs
@@ -1,11 +1,6 @@
-mod helpers;
-
+pub(crate) mod helpers;
 pub mod issuer;
 pub mod prover;
 pub mod tails;
 pub mod types;
 pub mod verifier;
-
-pub mod utils {
-    pub use super::helpers::encode_credential_attribute;
-}
diff --git a/tests/multiple-credentials.rs b/tests/multiple-credentials.rs
index 14f8474c..4116edd4 100644
--- a/tests/multiple-credentials.rs
+++ b/tests/multiple-credentials.rs
@@ -191,7 +191,9 @@ fn test_requests_generate<'a>() -> Vec<ReqInput<'a>> {
 
 #[test]
 fn anoncreds_with_multiple_credentials_per_request() {
+    #[cfg(feature = "logger")]
     env_logger::init();
+
     let mut mock = utils::Mock::new(&[ISSUER_ID], &[PROVER_ID], TF_PATH, MAX_CRED_NUM);
 
     let issuer1_creds = create_issuer_data();