diff --git a/ccsrc/Protocols/Xml/src/xml_converters.cc b/ccsrc/Protocols/Xml/src/xml_converters.cc
index 4f47eea6c8486cd6068b907ed2cf744ba3a0bbc5..ef9823303a43849418ecde14332f7279cce74d5e 100644
--- a/ccsrc/Protocols/Xml/src/xml_converters.cc
+++ b/ccsrc/Protocols/Xml/src/xml_converters.cc
@@ -75,10 +75,60 @@ int xml_converters::xml_transform(const std::string& p_to_transform, std::string
   } // End of 'while'statement
 
   // <Payload xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="XmlEntityPayload">
-  first = p_transformed.find("<Payload");
+  first = p_transformed.find("<Payload ");
+  int l = 9;
   if ((first != -1) && (first < p_to_transform.length())) {
-    next = p_transformed.find("\">", first + 8 + 1);
-    p_transformed = p_transformed.substr(0, first + 8) + p_transformed.substr(next + 1,  p_transformed.length() - next - 1);
+    next = p_transformed.find("\">", first + l + 1);
+    loggers::get_instance().log("xml_converters::xml_transform: New p_transformed (3): '%s'", p_transformed.c_str());
+    p_transformed = p_transformed.substr(0, first + l) + p_transformed.substr(next + 1,  p_transformed.length() - next - 1);
+  }
+  // <Agent xsi:type="ns6:Organization" xmlns:ns6="http://www.cise.eu/datamodel/v1/entity/organization/">
+  first = p_transformed.find("<Agent ");
+  l = 7;
+  if ((first != -1) && (first < p_to_transform.length())) {
+    next = p_transformed.find("\">", first + l + 1);
+    loggers::get_instance().log("xml_converters::xml_transform: New p_transformed (4): '%s'", p_transformed.c_str());
+    p_transformed = p_transformed.substr(0, first + l) + p_transformed.substr(next + 1,  p_transformed.length() - next - 1);
+  }
+  // <Location xsi:type=...">
+  first = p_transformed.find("<Location ");
+  l = 10;
+  if ((first != -1) && (first < p_to_transform.length())) {
+    next = p_transformed.find("\">", first + l + 1);
+    loggers::get_instance().log("xml_converters::xml_transform: New p_transformed (5): '%s'", p_transformed.c_str());
+    p_transformed = p_transformed.substr(0, first + l) + p_transformed.substr(next + 1,  p_transformed.length() - next - 1);
+  }
+  // <Object xsi:type=...">
+  first = p_transformed.find("<Object ");
+  l = 8;
+  if ((first != -1) && (first < p_to_transform.length())) {
+    next = p_transformed.find("\">", first + l + 1);
+    loggers::get_instance().log("xml_converters::xml_transform: New p_transformed (6): '%s'", p_transformed.c_str());
+    p_transformed = p_transformed.substr(0, first + l) + p_transformed.substr(next + 1,  p_transformed.length() - next - 1);
+  }
+  // <Event xsi:type=...">
+  first = p_transformed.find("<Event ");
+  l = 7;
+  if ((first != -1) && (first < p_to_transform.length())) {
+    next = p_transformed.find("\">", first + l + 1);
+    loggers::get_instance().log("xml_converters::xml_transform: New p_transformed (7): '%s'", p_transformed.c_str());
+    p_transformed = p_transformed.substr(0, first + l) + p_transformed.substr(next + 1,  p_transformed.length() - next - 1);
+  }
+  // <Document xsi:type=...">
+  first = p_transformed.find("<Document ");
+  l = 10;
+  if ((first != -1) && (first < p_to_transform.length())) {
+    next = p_transformed.find("\">", first + l + 1);
+    loggers::get_instance().log("xml_converters::xml_transform: New p_transformed (8): '%s'", p_transformed.c_str());
+    p_transformed = p_transformed.substr(0, first + l) + p_transformed.substr(next + 1,  p_transformed.length() - next - 1);
+  }
+  // <Document xsi:type=...">
+  first = p_transformed.find("<Requests ");
+  l = 10;
+  if ((first != -1) && (first < p_to_transform.length())) {
+    next = p_transformed.find("\">", first + l + 1);
+    loggers::get_instance().log("xml_converters::xml_transform: New p_transformed (8): '%s'", p_transformed.c_str());
+    p_transformed = p_transformed.substr(0, first + l) + p_transformed.substr(next + 1,  p_transformed.length() - next - 1);
   }
   
   loggers::get_instance().log("<<< xml_converters::xml_transform: '%s'", p_transformed.c_str());
diff --git a/ccsrc/security/src/securty_services.cc b/ccsrc/security/src/securty_services.cc
index e6d0acb26e1c9df89753f8dcd706024483ee8eaf..eb459f6986850b9ae0a0aa6bf5d09daf96310f5d 100644
--- a/ccsrc/security/src/securty_services.cc
+++ b/ccsrc/security/src/securty_services.cc
@@ -50,10 +50,11 @@ int security_services::do_sign(const OCTETSTRING& p_encoded_message, const OCTET
   // Transform: Remove all CR, LS, TAB and SPACE outside of the tags
   std::string transformed;
   xml_converters::get_instance().xml_transform(std::string((const char*)(static_cast<const unsigned char*>(p_encoded_message)), p_encoded_message.lengthof()), transformed);
-  loggers::get_instance().log("security_services::do_sign: p_pull_request_transormed: ", transformed.c_str());
+  loggers::get_instance().log("security_services::do_sign: p_pull_request_transormed: '%s'", transformed.c_str());
   // Canonicalization
   std::string canonicalized;
   xml_converters::get_instance().xml_canonicalization(transformed, canonicalized);
+  loggers::get_instance().log("security_services::do_sign: canonicalized: '%s'", canonicalized.c_str());
   p_pull_request_canonicalized = CHARSTRING(canonicalized.c_str());
   OCTETSTRING encoded_message(char2oct(p_pull_request_canonicalized));
   loggers::get_instance().log_msg("security_services::do_sign: p_pull_request_canonicalized: ", p_pull_request_canonicalized);
diff --git a/ttcn/LibHelpers/ttcn/LibHelpers_Functions.ttcn b/ttcn/LibHelpers/ttcn/LibHelpers_Functions.ttcn
index 90253cd0f3eec4b559931039b2802f410476ccbd..32711d842fa9dbe5948f052f8d24fd0a8817dc32 100644
--- a/ttcn/LibHelpers/ttcn/LibHelpers_Functions.ttcn
+++ b/ttcn/LibHelpers/ttcn/LibHelpers_Functions.ttcn
@@ -162,23 +162,28 @@ module LibHelpers_Functions {
         external function fx_getDSecond() return UInt16;
         
         /**
-        * @desc    Encode into Base64
-        * @return  p_to_encode - The buffer to be encoded
-        */
+         * @desc    Encode into Base64
+         * @return  p_to_encode - The buffer to be encoded
+         */
         external function fx_enc_base64(in octetstring p_to_encode) return octetstring;
 
         /**
-        * @desc    Decode from Base64
-        * @return  p_to_decode - The buffer to be decoded
-        */
+         * @desc    Decode from Base64
+         * @return  p_to_decode - The buffer to be decoded
+         */
         external function fx_dec_base64(in octetstring p_to_decode) return octetstring;
 
         /**
-        * @desc Generate a new UUID
-        * @return The UUID in string format on success, a null string otherwise 
-        */
+         * @desc Generate a new UUID
+         * @return The UUID in string format on success, a null string otherwise 
+         */
         external function fx_generate_uuid() return charstring;
 
+        /**
+         * @brief Retrieve the current local date/time formatted as yyyy-mm-ddThh:mm:ss.lll+nn:00
+         * @param p_shift_time The algebric number of seconds to add to the current time
+         * @return The the current date/time on success, a null string otherwise 
+         */
         external function fx_get_current_date_time(in integer p_shift_time) return charstring;
 
     } // End of externals
diff --git a/ttcn/LibHttp/ttcn/LibHttp_Templates.ttcn b/ttcn/LibHttp/ttcn/LibHttp_Templates.ttcn
index fc641a2f297e60a04a897492fa6cf64d18cf31e2..8bbfa1e35be0028b74b6bb5de316db81bd43105c 100644
--- a/ttcn/LibHttp/ttcn/LibHttp_Templates.ttcn
+++ b/ttcn/LibHttp/ttcn/LibHttp_Templates.ttcn
@@ -366,13 +366,13 @@ module LibHttp_Templates {
     group http_html_body {
       
       template (value) HttpMessageBody m_http_message_body_html(
-                                                               in template (value) HtmlBody p_html_body
+                                                                in template (value) HtmlBody p_html_body
       ) := {
           html_body := p_html_body
       } // End of template m_http_message_body_html
       
       template (present) HttpMessageBody mw_http_message_body_html(
-                                                                  template (present) HtmlBody p_html_body := ?
+                                                                   template (present) HtmlBody p_html_body := ?
       ) := {
           html_body := p_html_body
       } // End of template mw_http_message_body_html
@@ -398,13 +398,13 @@ module LibHttp_Templates {
     group http_json_body {
       
       template (value) HttpMessageBody m_http_message_body_json(
-                                                               in template (value) JsonBody p_json_body
+                                                                in template (value) JsonBody p_json_body
       ) := {
           json_body := p_json_body
       } // End of template m_http_message_body_json
       
       template (present) HttpMessageBody mw_http_message_body_json(
-                                                                  template (present) JsonBody p_json_body := ?
+                                                                   template (present) JsonBody p_json_body := ?
       ) := {
           json_body := p_json_body
       } // End of template mw_http_message_body_json