diff --git a/ccsrc/security/src/securty_services.cc b/ccsrc/security/src/securty_services.cc
index 73423f2a50e03cf78676f84a00e3981a2352f00b..c5fcc952b68e646d46dbba71494eae541dc16f8e 100644
--- a/ccsrc/security/src/securty_services.cc
+++ b/ccsrc/security/src/securty_services.cc
@@ -23,7 +23,7 @@ int security_services::initialize(const std::string& p_certs_db_path) {
 
   security_services::_certs_db = new certs_db(p_certs_db_path);
   if (security_services::_certs_db == nullptr) { // Memory allocation issue
-    loggers::get_instance().warning("security_services::setup: _security_db pointer is NULL");
+    loggers::get_instance().warning("security_services::initialize: _security_db pointer is NULL");
     return -1;
   }
 
diff --git a/ttcn/LibHttp/ttcn/LibHttp_Templates.ttcn b/ttcn/LibHttp/ttcn/LibHttp_Templates.ttcn
index 08359cb17fd8ed137fee9a1f396395df2fdc430a..b5eb352c39e119cfa05380d47d354f7cf21c4d6f 100644
--- a/ttcn/LibHttp/ttcn/LibHttp_Templates.ttcn
+++ b/ttcn/LibHttp/ttcn/LibHttp_Templates.ttcn
@@ -176,7 +176,9 @@ module LibHttp_Templates {
           statuscode    := 200,
           statustext    := "OK",
           header        := p_header,
-          body          := omit
+          body          := omit,
+          tls           := omit,
+          mutual_tls    := omit
       } // End of template m_http_response_ok_no_body
       
       template (present) Response mw_http_response_ok_no_body(
@@ -247,7 +249,9 @@ module LibHttp_Templates {
           statuscode    := p_statuscode,
           statustext    := p_statustext,
           header        := p_header,
-          body          := p_body
+          body          := p_body,
+          tls           := omit,
+          mutual_tls    := omit
       } // End of template m_http_response_ko
       
       template (value) Response m_http_response_ko_no_body(
@@ -260,7 +264,9 @@ module LibHttp_Templates {
           statuscode    := p_statuscode,
           statustext    := p_statustext,
           header        := p_header,
-          body          := omit
+          body          := omit,
+          tls           := omit,
+          mutual_tls    := omit
       } // End of template m_http_response_ko_no_body
       
       template (value) Response m_http_response_500_internal_error(
@@ -280,7 +286,9 @@ module LibHttp_Templates {
           statuscode    := p_statuscode,
           statustext    := p_statustext,
           header        := p_header,
-          body          := omit
+          body          := omit,
+          tls           := omit,
+          mutual_tls    := omit
       } // End of template mw_http_response_ko_no_body
       
       template Response mw_http_response_ko(
@@ -292,7 +300,9 @@ module LibHttp_Templates {
           statuscode    := complement(200),
           statustext    := ?,
           header        := p_header,
-          body          := p_body
+          body          := p_body,
+          tls           := omit,
+          mutual_tls    := omit
       } // End of template mw_http_response_ko
       
       template (value) Response m_http_response_400_bad_request(
diff --git a/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn b/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
index 96cfb2f44087a1dd1b5b08643c684627b8797aba..dbc34013ba5e1209dd7311bd7033046c178bdd56 100644
--- a/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
+++ b/ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
@@ -19,6 +19,6 @@ module LibHttp_XmlMessageBodyTypes {
     }
     
 } with {
-  encode "XML";
-  variant ""
+  variant "";
+  encode "XML"
 } // End of LibHttp_XmlMessageBodyTypes
diff --git a/ttcn/LibHttp/ttcn/LibHttp_XmlTemplates.ttcn b/ttcn/LibHttp/ttcn/LibHttp_XmlTemplates.ttcn
index fbfab3ab8b0eda2b982523b501033edaa9e2ce52..343300c36779cd46cf38ba7f35db1027fbfb4833 100644
--- a/ttcn/LibHttp/ttcn/LibHttp_XmlTemplates.ttcn
+++ b/ttcn/LibHttp/ttcn/LibHttp_XmlTemplates.ttcn
@@ -21,12 +21,14 @@ module LibHttp_XmlTemplates {
   template (value) XmlBody m_xml_body_raw(
                                           in template (value) charstring p_raw
   ) := {
+    msg := { raw := p_raw },
     raw := p_raw
   } // End of template m_xml_body_raw
 
   template (present) XmlBody mw_xml_body_raw(
                                              template (present) charstring p_raw := ?
   ) := {
+    msg := { raw := p_raw },
     raw := p_raw
   } // End of template mw_xml_body_raw