diff --git a/client/Comm/Socket/SocketClient.cpp b/client/Comm/Socket/SocketClient.cpp
index fc582f43a..42954dc6b 100644
--- a/client/Comm/Socket/SocketClient.cpp
+++ b/client/Comm/Socket/SocketClient.cpp
@@ -20,7 +20,8 @@ int32_t SocketClient::initiateConnection() {
     struct sockaddr_un addr;
     memset(&addr, 0, sizeof(struct sockaddr_un));
     addr.sun_family = AF_UNIX;
-    if(snprintf(addr.sun_path, UNIX_PATH_MAX, RESTUNE_SOCKET_PATH) >= UNIX_PATH_MAX) {
+    size_t written = snprintf(addr.sun_path, UNIX_PATH_MAX, RESTUNE_SOCKET_PATH);
+    if(written >= UNIX_PATH_MAX) {
         LOGE("RESTUNE_SOCKET_CLIENT", "Socket path too long");
         close(this->sockFd);
         this->sockFd = -1;
diff --git a/extensions/Include/Extensions.h b/extensions/Include/Extensions.h
index dd96ea539..08d0c4eb4 100644
--- a/extensions/Include/Extensions.h
+++ b/extensions/Include/Extensions.h
@@ -71,8 +71,7 @@ class Extensions {
     static PostProcessingCallback getPostProcessingCallback(const std::string& identifier);
 };
 
-#define CONCAT_IMPL(a, b) a##b
-#define CONCAT(a, b) CONCAT_IMPL(a, b)
+#define CONCAT(a, b) a ## b
 
 /**
  * \def URM_REGISTER_RES_APPLIER_CB(resCode, resourceApplierCallback)
diff --git a/resource-tuner/core/Server/Include/RestuneListener.h b/resource-tuner/core/Server/Include/RestuneListener.h
index 8493ed668..3c21fbdd9 100644
--- a/resource-tuner/core/Server/Include/RestuneListener.h
+++ b/resource-tuner/core/Server/Include/RestuneListener.h
@@ -38,7 +38,7 @@ class SocketServer : public ServerEndpoint {
         ServerOnlineCheckCallback mServerOnlineCheckCb,
         MessageReceivedCallback mMessageRecvCb);
 
-    ~SocketServer();
+    virtual ~SocketServer();
 
     virtual int32_t ListenForClientRequests();
     virtual int32_t closeConnection();
diff --git a/resource-tuner/core/Server/RestuneListener.cpp b/resource-tuner/core/Server/RestuneListener.cpp
index dd2e06c9c..35b2b60b6 100644
--- a/resource-tuner/core/Server/RestuneListener.cpp
+++ b/resource-tuner/core/Server/RestuneListener.cpp
@@ -35,7 +35,8 @@ int32_t SocketServer::ListenForClientRequests() {
     struct sockaddr_un addr;
     memset(&addr, 0, sizeof(sockaddr_un));
     addr.sun_family = AF_UNIX;
-    if(snprintf(addr.sun_path, UNIX_PATH_MAX, RESTUNE_SOCKET_PATH) >= UNIX_PATH_MAX) {
+    size_t written = snprintf(addr.sun_path, UNIX_PATH_MAX, RESTUNE_SOCKET_PATH);
+    if(written >= UNIX_PATH_MAX) {
         LOGE("RESTUNE_SOCKET_SERVER", "Socket path too long");
         close(this->sockFd);
         this->sockFd = -1;
diff --git a/resource-tuner/core/TargetRegistry.cpp b/resource-tuner/core/TargetRegistry.cpp
index 128570a5a..be0d91561 100644
--- a/resource-tuner/core/TargetRegistry.cpp
+++ b/resource-tuner/core/TargetRegistry.cpp
@@ -157,7 +157,7 @@ void TargetRegistry::generatePolicyBasedMapping(std::vector<std::string>& policy
 
     // Now, Create the Logical to Physical Mappings
     // Note the Clusters are arranged in increasing order of Capacities
-    for(int32_t i = 0; i < clusterConfigs.size(); i++) {
+    for(size_t i = 0; i < clusterConfigs.size(); i++) {
         this->mLogicalToPhysicalClusterMapping[i] = clusterConfigs[i].second.second->mPhysicalID;
     }
 }
@@ -235,7 +235,7 @@ void TargetRegistry::getClusterIdBasedMapping() {
 
     // Now, Create the Logical to Physical Mappings
     // Note the Clusters are arranged in increasing order of Capacities
-    for(int32_t i = 0; i < clusterConfigs.size(); i++) {
+    for(size_t i = 0; i < clusterConfigs.size(); i++) {
         this->mLogicalToPhysicalClusterMapping[i] = clusterConfigs[i].second->mPhysicalID;
     }
 }
diff --git a/resource-tuner/init/RestuneParser.cpp b/resource-tuner/init/RestuneParser.cpp
index b61fa988b..70209ad27 100644
--- a/resource-tuner/init/RestuneParser.cpp
+++ b/resource-tuner/init/RestuneParser.cpp
@@ -696,7 +696,7 @@ ErrCode RestuneParser::parseSignalConfigYamlNode(const std::string& filePath, in
                         rc = resourceBuilder->setNumValues(resValues.size());
                     }
 
-                    for(int32_t idx = 0; idx < resValues.size(); idx++) {
+                    for(size_t idx = 0; idx < resValues.size(); idx++) {
                         if(RC_IS_OK(rc)) {
                             rc = resourceBuilder->addValue(idx, resValues[idx]);
                         }
@@ -971,7 +971,7 @@ ErrCode RestuneParser::parsePerAppConfigYamlNode(const std::string& filePath) {
                             return RC_YAML_INVALID_SYNTAX;
                         }
                     }
-                    for(int32_t i = 0; i < itemArray.size(); i++) {
+                    for(size_t i = 0; i < itemArray.size(); i++) {
                         if(RC_IS_OK(rc)) {
                             rc = appConfigBuider->addSigCode(i, itemArray[i]);
                             if(RC_IS_NOTOK(rc)) {