diff --git a/ccsrc/security/src/certs_loader.cc b/ccsrc/security/src/certs_loader.cc
index ec98eae39ccdded86de8aba5ce82f406597a5eac..91bd87b51dae9353cc1ebd6c5942fabb336b085f 100644
--- a/ccsrc/security/src/certs_loader.cc
+++ b/ccsrc/security/src/certs_loader.cc
@@ -77,7 +77,7 @@ int certs_loader::get_certificate_id(const std::string& p_certificate_name, std:
 }
 
 int certs_loader::load_certificate(const std::string& p_certificate_name, const std::string& p_private_key_name, const std::string& p_private_key_passwd, std::string& p_certificate_id, std::map<std::string, std::unique_ptr<const certs_db_record>> & p_certificates) {
-  loggers::get_instance().log(">>> certs_loader::load_certificate '%s'", p_certificate_name.c_str());
+  loggers::get_instance().log(">>> certs_loader::load_certificate: '%s'", p_certificate_name.c_str());
   loggers::get_instance().log(">>> certs_loader::load_certificate: '%s'", p_private_key_name.c_str());
 
   // Load certificate file
@@ -115,7 +115,7 @@ int certs_loader::load_certificate(const std::string& p_certificate_name, const
   }
   std::string pem(mem->data, mem->length);
   // Remove labels
-  //loggers::get_instance().log("certs_loader::load_certificate: certificate pem (1): '%s'", pem.c_str());
+  loggers::get_instance().log("certs_loader::load_certificate: certificate pem (1): '%s'", pem.c_str());
   std::string s("-----BEGIN CERTIFICATE-----\n");
   std::string::size_type idx = pem.find_first_of(s);
   pem = pem.substr(s.length());
diff --git a/ccsrc/security/src/securty_services.cc b/ccsrc/security/src/securty_services.cc
index c5fcc952b68e646d46dbba71494eae541dc16f8e..3c343f902226c593c518c9c526ec80d16faa2af0 100644
--- a/ccsrc/security/src/securty_services.cc
+++ b/ccsrc/security/src/securty_services.cc
@@ -132,6 +132,8 @@ int security_services::do_sign(const OCTETSTRING& p_encoded_message, const OCTET
   canonicalized = canonicalized.substr(0, i + 13) + std::string(to64.cbegin(), to64.cend()) + canonicalized.substr(i + 13, canonicalized.length() - i - 13);
   OCTETSTRING to_be_signed(char2oct(CHARSTRING(canonicalized.c_str())));
   loggers::get_instance().log_msg("security_services::do_sign: to_be_signed: ", to_be_signed);
+  to64 = converter::get_instance().buffer_to_base64(std::vector(static_cast<const unsigned char*>(to_be_signed), to_be_signed.lengthof() + static_cast<const unsigned char*>(to_be_signed)));
+  loggers::get_instance().log("security_services::do_sign: Data to be signed/verified: '%s'", converter::get_instance().bytes_to_string(to64).c_str());
 
   // Retrive the private key
   const EVP_PKEY* private_key;
@@ -237,16 +239,16 @@ bool security_services::do_sign_verify(const CHARSTRING& p_message, const OCTETS
   // Transform: Remove all CR, LS, TAB and SPACE outside of the tags
   transformed.clear();
   xml_converters::get_instance().xml_transform(std::string((const char*)(static_cast<const unsigned char*>(p_empty_signature)), p_empty_signature.lengthof()), transformed);
-  loggers::get_instance().log("security_services::do_sign: p_empty_signature transormed: '%s'", transformed.c_str());
+  loggers::get_instance().log("security_services::do_sign_verify: p_empty_signature transormed: '%s'", transformed.c_str());
   // Canonicalization
   canonicalized.clear();
   xml_converters::get_instance().xml_canonicalization(transformed, canonicalized);
-  loggers::get_instance().log("security_services::do_sign: p_empty_signature canonicalized: '%s'", canonicalized.c_str());
+  loggers::get_instance().log("security_services::do_sign_verify: p_empty_signature canonicalized: '%s'", canonicalized.c_str());
 
   // Compute the digest of the transformed/canonicalized message
-  loggers::get_instance().log_msg("security_services::do_sign: compute digest for ", v_pull_request_canonicalized);
+  loggers::get_instance().log_msg("security_services::do_sign_verify: compute digest for ", v_pull_request_canonicalized);
   int first = canonicalized.find("xmldsig#sha1");
-  loggers::get_instance().log("security_services::do_sign: p_empty_signature first: '%d'", first);
+  loggers::get_instance().log("security_services::do_sign_verify: p_empty_signature first: '%d'", first);
   OCTETSTRING dg;
   const EVP_MD* sign_digest;
   if (first != -1) {
@@ -322,7 +324,9 @@ bool security_services::do_sign_verify(const CHARSTRING& p_message, const OCTETS
   int i = canonicalized.find("<DigestValue>");
   canonicalized = canonicalized.substr(0, i + 13) + std::string(to64.cbegin(), to64.cend()) + canonicalized.substr(i + 13, canonicalized.length() - i - 13);
   OCTETSTRING to_be_signed(char2oct(CHARSTRING(canonicalized.c_str())));
-  loggers::get_instance().log_msg("security_services::do_sign: to_be_signed: ", to_be_signed);
+  loggers::get_instance().log_msg("security_services::do_sign_verify: to_be_signed: ", to_be_signed);
+  to64 = converter::get_instance().buffer_to_base64(std::vector(static_cast<const unsigned char*>(to_be_signed), to_be_signed.lengthof() + static_cast<const unsigned char*>(to_be_signed)));
+  loggers::get_instance().log("security_services::do_sign_verify: Data to be signed/verified: '%s'", converter::get_instance().bytes_to_string(to64).c_str());
 
   // Convert signature
   std::string signature_value(static_cast<const char*>(unichar2char(p_signature_value)));