diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c0b844c..493e2856 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,10 +40,6 @@ if(ENABLE_COMMUNITY_DEVICE_TYPE)
    add_definitions(-DENABLE_COMMUNITY_DEVICE_TYPE)
 endif()
 
-if(RDK_SERVICES_L1_TEST)
-    add_subdirectory(Tests/L1Tests)
-endif()
-
 if(PLUGIN_XCAST)
     add_subdirectory(XCast)
 endif()
diff --git a/Miracast/common/MiracastLogger.cpp b/Miracast/common/MiracastLogger.cpp
index 84293be0..70e51626 100644
--- a/Miracast/common/MiracastLogger.cpp
+++ b/Miracast/common/MiracastLogger.cpp
@@ -34,13 +34,13 @@ namespace MIRACAST
             setvbuf(stdout, NULL, _IOLBF, 0);
     }
 
-    const char *methodName(const std::string &prettyFunction)
+    std::string methodName(const std::string &prettyFunction)
     {
         size_t colons = prettyFunction.find("::");
         size_t begin = prettyFunction.substr(0, colons).rfind(" ") + 1;
         size_t end = prettyFunction.rfind("(") - begin;
 
-        return prettyFunction.substr(begin, end).c_str();
+        return prettyFunction.substr(begin, end);
     }
 
     static int gDefaultLogLevel = INFO_LEVEL;
diff --git a/Miracast/common/MiracastLogger.h b/Miracast/common/MiracastLogger.h
index 892cdcdc..5e34dcea 100644
--- a/Miracast/common/MiracastLogger.h
+++ b/Miracast/common/MiracastLogger.h
@@ -31,7 +31,7 @@
 
 namespace MIRACAST {
 
-const char* methodName(const std::string& prettyFunction);
+std::string methodName(const std::string& prettyFunction);
 #define __METHOD_NAME__ MIRACAST::methodName(__PRETTY_FUNCTION__)
 
 /**
diff --git a/XCast/XCast.cpp b/XCast/XCast.cpp
index ce9ba88b..134278cf 100644
--- a/XCast/XCast.cpp
+++ b/XCast/XCast.cpp
@@ -1022,7 +1022,7 @@ void XCast::updateDynamicAppCache(JsonArray applications)
                     itrName = jNames[i].String().c_str();
                     LOGINFO("%s, size:%d", itrName.c_str(), (int)strlen (itrName.c_str()));
                     DynamicAppConfig* pDynamicAppConfig = (DynamicAppConfig*) malloc (sizeof(DynamicAppConfig));
-                    memset ((void*)pDynamicAppConfig, '0', sizeof(DynamicAppConfig));
+                    memset ((void*)pDynamicAppConfig, '\0', sizeof(DynamicAppConfig));
                     memset (pDynamicAppConfig->appName, '\0', sizeof(pDynamicAppConfig->appName));
                     strncpy (pDynamicAppConfig->appName, itrName.c_str(), sizeof(pDynamicAppConfig->appName) - 1);
                     pDynamicAppConfig->appName[sizeof(pDynamicAppConfig->appName) - 1] = '\0';
diff --git a/XCast/XCastImplementation.cpp b/XCast/XCastImplementation.cpp
index e1d8d0f0..6ac60472 100644
--- a/XCast/XCastImplementation.cpp
+++ b/XCast/XCastImplementation.cpp
@@ -241,7 +241,7 @@ namespace Plugin {
                 DynamicAppConfig* pDynamicAppConfig = (DynamicAppConfig*) malloc (sizeof(DynamicAppConfig));
                 if (pDynamicAppConfig)
                 {
-                    memset ((void*)pDynamicAppConfig, '0', sizeof(DynamicAppConfig));
+                    memset ((void*)pDynamicAppConfig, '\0', sizeof(DynamicAppConfig));
                     memset (pDynamicAppConfig->appName, '\0', sizeof(pDynamicAppConfig->appName));
                     memset (pDynamicAppConfig->prefixes, '\0', sizeof(pDynamicAppConfig->prefixes));
                     memset (pDynamicAppConfig->cors, '\0', sizeof(pDynamicAppConfig->cors));