diff --git a/libs/errlog/src/ErrLog.cpp b/libs/errlog/src/ErrLog.cpp
index f65b1e95c..a07987b0d 100644
--- a/libs/errlog/src/ErrLog.cpp
+++ b/libs/errlog/src/ErrLog.cpp
@@ -177,7 +177,7 @@ ErrLog::~ErrLog ()
     m_ErrOutputter = nullptr;
   }
 
-  delete m_outBuf;
+  delete[] m_outBuf;
 }
 
 void ErrLog::InitMessageTable()
diff --git a/libs/xmlreader/src/XML_Reader.cpp b/libs/xmlreader/src/XML_Reader.cpp
index 68de12ef7..3ce1f35ac 100644
--- a/libs/xmlreader/src/XML_Reader.cpp
+++ b/libs/xmlreader/src/XML_Reader.cpp
@@ -307,7 +307,7 @@ Err XML_Reader::Close()
 size_t XML_Reader::ReadLine()
 {
   if(!m_InputSourceReader->IsValid()) {
-    LogMsg("M410", GetLineNumber());     //fprintf(stderr, "Lost xml file stream at line %d.\n", GetLineNumber());
+    LogMsg("M410", GetLineNumber());
     return 0;
   }
 
@@ -401,51 +401,61 @@ UTFCode XML_Reader::CheckUTF(const string& text)
 
   UTFCode utfDetected = UTFCode::UTF_NULL;
   switch (*str++) {
-  case (char)0xEF: {
-    switch (*str++) {
-    case (char)0xBB: {
+    case (char)0xEF: {
       switch (*str++) {
-      case (char)0xBF: {
-        utfDetected = UTFCode::UTF8;
-      } break;
+        case (char)0xBB: {
+          switch (*str++) {
+            case (char)0xBF: {
+              utfDetected = UTFCode::UTF8;
+            } break;
+            default:
+              break;
+          }
+        } break;
+        default:
+          break;
       }
     } break;
-    }
-  } break;
 
-  case (char)0xFE: {
-    switch (*str++) {
-    case (char)0xFF: {
-      utfDetected = UTFCode::UTF16_BE;
+    case (char)0xFE: {
+      switch (*str++) {
+        case (char)0xFF: {
+          utfDetected = UTFCode::UTF16_BE;
+        } break;
+        default:
+          break;
+      }
     } break;
-    }
-  } break;
 
-  case (char)0xFF: {
-    switch (*str++) {
-    case (char)0xFE: {
-      utfDetected = UTFCode::UTF16_LE;
+    case (char)0xFF: {
+      switch (*str++) {
+        case (char)0xFE: {
+          utfDetected = UTFCode::UTF16_LE;
+        } break;
+        default:
+          break;
+      }
     } break;
-    }
-  } break;
+    default:
+      break;
   }
 
   if (utfDetected != UTFCode::UTF_NULL) {
-    string text = "UTF Error";
+    string txt = "UTF Error";
 
     auto find = m_UTFCodeText.find(utfDetected);
     if (find != m_UTFCodeText.end()) {
-      text = find->second;
+      txt = find->second;
     }
 
-    LogMsg("M411", VAL("UTF", text));     //printf("\nUnicode: Preamble for %s should not be used, already specified via '<?xml'");
+    LogMsg("M411", VAL("UTF", txt));     //"\nUnicode: Preamble for %s should not be used, already specified via '<?xml'"
     if (utfDetected != UTFCode::UTF8) {
-      LogMsg("M413", VAL("UTF", text));   // printf("\nUTF Format not supported: %s", UTFCode_str[isUtf]);
+      LogMsg("M413", VAL("UTF", txt));   // "\nUTF Format not supported: %s", UTFCode_str[isUtf]
     }
   }
 
   if (*str) {
-    LogMsg("M412", VAL("STR", str));      //printf("\nUnicode: Unsupported format or extra characters found before '<?xml': \"%s\"\n", str);
+    LogMsg("M412", VAL("STR", str));      //"\nUnicode: Unsupported format or extra characters found before '<?xml': \"%s\"\n", str
   }
 
   return utfDetected;
@@ -539,13 +549,13 @@ bool XML_Reader::ReadNext()
         specialChar += c;
 
         if (c == '/' && c_prev == '<') {       // probably found an error
-          LogMsg("M414", VAL("SPECIALCHAR", specialChar), MSG("Found END Tag!"), GetLineNumber());   // printf("Line %d: Problem while parsing XML special characters: '%s'. Found END Tag!\n", GetLineNumber(), m_xmlData.specialChar);
+          LogMsg("M414", VAL("SPECIALCHAR", specialChar), MSG("Found END Tag!"), GetLineNumber());   // "Line %d: Problem while parsing XML special characters: '%s'. Found END Tag!\n", GetLineNumber(), m_xmlData.specialChar
           CorrectCnt(-1 * (int)specialChar.length());
           break;
         }
 
         if (specialChar.length() > 32) {
-          LogMsg("M414", VAL("SPECIALCHAR", specialChar), MSG("String too long!"), GetLineNumber());   // printf("Line %d: Problem while parsing XML special characters: '%s'. String too uint32_t!\n", GetLineNumber(), m_xmlData.specialChar);
+          LogMsg("M414", VAL("SPECIALCHAR", specialChar), MSG("String too long!"), GetLineNumber());   // "Line %d: Problem while parsing XML special characters: '%s'. String too uint32_t!\n", GetLineNumber(), m_xmlData.specialChar
           CorrectCnt(-1 * (int)specialChar.length());
           break;
         }
@@ -710,7 +720,7 @@ void XML_Reader::PrintTagStack()
     msg += tag;
   }
 
-  LogMsg("M406", MSG(msg));   // printf("XML Stack: ");
+  LogMsg("M406", MSG(msg));   // "XML Stack: "
 }
 
 bool XML_Reader::NextEntry ()
@@ -734,14 +744,14 @@ bool XML_Reader::NextEntry ()
       PopTag(xmlTag);
 
       if(!m_bPrevTagIsSingle && (xmlTag != m_xmlData.tagData)) {
-        LogMsg("M417", GetLineNumber());          // printf("Line %d: Inconsistent XML Structure\n", GetLineNumber());
+        LogMsg("M417", GetLineNumber());          // "Line %d: Inconsistent XML Structure\n", GetLineNumber()
         PushTag(xmlTag);
         PrintTagStack();
         PopTag(xmlTag);
 
         if(doTryAgain) {
           if(!xmlTag.empty()) {
-            LogMsg("M401", VAL("TAG", xmlTag));   // printf("Line %d: Did you mean '%s' ?\n", GetLineNumber(), xmlTag);
+            LogMsg("M401", VAL("TAG", xmlTag));   // "Line %d: Did you mean '%s' ?\n", GetLineNumber(), xmlTag
             m_xmlData.tagData = xmlTag;
           }
         }
@@ -749,14 +759,14 @@ bool XML_Reader::NextEntry ()
       else if(m_bPrevTagIsSingle) {
         m_bPrevTagIsSingle = false;
         if(xmlTag != m_xmlData.tagData) {
-          LogMsg("M417", GetLineNumber());        // printf("Line %d: Inconsistent XML Structure\n", GetLineNumber());
+          LogMsg("M417", GetLineNumber());        // "Line %d: Inconsistent XML Structure\n", GetLineNumber()
           PushTag(xmlTag);
           PrintTagStack();
           PopTag(xmlTag);
 
           if(doTryAgain) {
             if(!xmlTag.empty() && (xmlTag != m_xmlData.tagData))  {
-              LogMsg("M401", VAL("TAG", xmlTag));   // printf("Line %d: Did you mean '%s' ?\n", GetLineNumber(), xmlTag);
+              LogMsg("M401", VAL("TAG", xmlTag));   // "Line %d: Did you mean '%s' ?\n", GetLineNumber(), xmlTag
               m_xmlData.tagData = xmlTag;
             }
           }
@@ -765,11 +775,11 @@ bool XML_Reader::NextEntry ()
     }
     else if(m_xmlData.type == TagType::TAG_BEGIN) {
       if(!PushTag(m_xmlData.tagData)) {
-        LogMsg("M418", GetLineNumber());            // printf("Line %d: XML Stack deeper than 30 Items! Giving up...\n", GetLineNumber());
+        LogMsg("M418", GetLineNumber());            // "Line %d: XML Stack deeper than 30 Items! Giving up...\n", GetLineNumber()
         return 0;
       }
       if(m_bIsPrevText) {
-        LogMsg("M419", GetLineNumber());            // printf("Line %d: Begin Tag follows Text. Missing End Tag?\n", GetLineNumber());
+        LogMsg("M419", GetLineNumber());            // "Line %d: Begin Tag follows Text. Missing End Tag?\n", GetLineNumber()
         m_bIsPrevText = false;
         string xmlTag;
         PopTag(xmlTag);                             // correct stack
@@ -801,7 +811,7 @@ bool XML_Reader::Recover()
   uint32_t recoverCnt=0;
 
   errorTag = m_xmlData.tagData;
-  LogMsg("M407", GetLineNumber());    // printf("\nLine %d: Recover from Error\n", GetLineNumber());
+  LogMsg("M407", GetLineNumber());    // "\nLine %d: Recover from Error\n", GetLineNumber()
 
   if(m_bFirstTry) {                     // try to read a statement then return
     bool bOk = ReadNext();
@@ -839,14 +849,14 @@ bool XML_Reader::Recover()
       }
 
       if(m_xmlData.tagData == errorTag) {           // found end of unknown tag
-        LogMsg("M409", VAL("TAG", errorTag),  GetLineNumber());   // printf("Line %d: Skipping unknown Tag: '%s'\n", GetLineNumber(), errorTag);
+        LogMsg("M409", VAL("TAG", errorTag),  GetLineNumber());   // "Line %d: Skipping unknown Tag: '%s'\n", GetLineNumber(), errorTag
         break;
       }
     }
 
     recoverCnt++;
     if(recoverCnt > 100) {
-      LogMsg("M408", GetLineNumber());            // printf("\nLine %d: Recover from Error: giving up after 100 tries...\n", GetLineNumber());
+      LogMsg("M408", GetLineNumber());            // "\nLine %d: Recover from Error: giving up after 100 tries...\n", GetLineNumber()
       break;
     }
   } while(bOk);
@@ -917,13 +927,13 @@ bool XML_Reader::ReadNextAttribute(bool bInorePrefixes)
         specialChar += c;
 
         if(c == '/' && cPrev == '<') {       // probably found an error
-          LogMsg("M414", VAL("SPECIALCHAR", specialChar), MSG("Found END Tag!"), GetLineNumber());   // printf("Line %d: Problem while parsing XML special characters: '%s'. Found END Tag!\n", GetLineNumber(), m_xmlData.specialChar);
+          LogMsg("M414", VAL("SPECIALCHAR", specialChar), MSG("Found END Tag!"), GetLineNumber());   // "Line %d: Problem while parsing XML special characters: '%s'. Found END Tag!\n", GetLineNumber(), m_xmlData.specialChar
           CorrectCnt(-1 * (int)specialChar.length());
           break;
         }
 
         if (specialChar.length() > 32) {
-          LogMsg("M414", VAL("SPECIALCHAR", specialChar), MSG("String too uint32_t!"), GetLineNumber());   // printf("Line %d: Problem while parsing XML special characters: '%s'. String too uint32_t!\n", GetLineNumber(), m_xmlData.specialChar);
+          LogMsg("M414", VAL("SPECIALCHAR", specialChar), MSG("String too uint32_t!"), GetLineNumber());   // "Line %d: Problem while parsing XML special characters: '%s'. String too uint32_t!\n", GetLineNumber(), m_xmlData.specialChar
           CorrectCnt(-1 * (int)specialChar.length());
           break;
         }
diff --git a/tools/packchk/src/CheckComponents.cpp b/tools/packchk/src/CheckComponents.cpp
index a99e5ec0f..6e8d42ab5 100644
--- a/tools/packchk/src/CheckComponents.cpp
+++ b/tools/packchk/src/CheckComponents.cpp
@@ -68,8 +68,8 @@ bool CheckComponent::CheckComp(RteItem* item)
     if(pKg) {
       RteGeneratorContainer* genCont = pKg->GetGenerators();
       if(genCont) {
-        for(auto item : genCont->GetChildren()) {
-          RteGenerator* generator = dynamic_cast<RteGenerator*>(item);
+        for(auto itm : genCont->GetChildren()) {
+          RteGenerator* generator = dynamic_cast<RteGenerator*>(itm);
           if(!generator) {
             continue;
           }
diff --git a/tools/packchk/src/CheckConditions.cpp b/tools/packchk/src/CheckConditions.cpp
index bcb7cb87d..532ee2dd4 100644
--- a/tools/packchk/src/CheckConditions.cpp
+++ b/tools/packchk/src/CheckConditions.cpp
@@ -120,9 +120,9 @@ void UsedConditionsVisitor::GetUsedSubConditions(RteCondition* cond)
   m_Conditions->AddUsedCondition(cond);
 
   for(auto expression : cond->GetChildren()) {
-    RteCondition* cond = expression->GetCondition();
-    if(cond) {
-      GetUsedSubConditions(cond);
+    RteCondition* c = expression->GetCondition();
+    if(c) {
+      GetUsedSubConditions(c);
     }
     else {
       m_Conditions->TestSubConditions(expression);
diff --git a/tools/packchk/src/CheckFiles.cpp b/tools/packchk/src/CheckFiles.cpp
index 6d87d3134..90c024513 100644
--- a/tools/packchk/src/CheckFiles.cpp
+++ b/tools/packchk/src/CheckFiles.cpp
@@ -93,7 +93,9 @@ const string& CheckFiles::GetFolder(RteItem* item) const
   }
   else if(tag == "environment") {
     RteItem* parent = item->GetParent();
-    return parent->GetAttribute("folder");
+    if(parent) {
+      return parent->GetAttribute("folder");
+    }
   }
 
   return RteUtils::EMPTY_STRING;
diff --git a/tools/packchk/src/ValidateSemantic.cpp b/tools/packchk/src/ValidateSemantic.cpp
index b426ceda3..0c0ac44c7 100644
--- a/tools/packchk/src/ValidateSemantic.cpp
+++ b/tools/packchk/src/ValidateSemantic.cpp
@@ -730,8 +730,10 @@ bool ValidateSemantic::TestComponentDependencies()
     }
     else if(api) {
       RtePackage* apiPkg = api->GetPackage();
-      const string& packName = apiPkg->GetPackageFileName();
-      LogMsg("M378", CCLASS(compClass), CGROUP(compGroup), CSUB(compSub), CVER(compVer), NAME(packName), lineNo);
+      if(apiPkg) {
+        const string& packN = apiPkg->GetPackageFileName();
+        LogMsg("M378", CCLASS(compClass), CGROUP(compGroup), CSUB(compSub), CVER(compVer), NAME(packN), lineNo);
+      }
     }
 
     RteDependencyResult dependencyResult;
diff --git a/tools/packchk/src/ValidateSyntax.cpp b/tools/packchk/src/ValidateSyntax.cpp
index 693631cd1..724d79b05 100644
--- a/tools/packchk/src/ValidateSyntax.cpp
+++ b/tools/packchk/src/ValidateSyntax.cpp
@@ -220,10 +220,10 @@ bool ValidateSyntax::CheckInfo(RtePackage* pKg)
     LogMsg("M305");
     bInfoComplete = false;
   }
-  for(auto release : releases) {
-    const string& rVer = release->GetVersionString();
-    const string& rDescr = release->GetDescription();
-    int lineNo = release->GetLineNumber();
+  for(auto rel : releases) {
+    const string& rVer = rel->GetVersionString();
+    const string& rDescr = rel->GetDescription();
+    int lineNo = rel->GetLineNumber();
 
     if(rVer.empty() && !rDescr.empty()) {
       LogMsg("M328", VAL("DESCR", rDescr), lineNo);
@@ -673,13 +673,13 @@ bool ValidateSyntax::CheckFeatureDevice(RteDeviceProperty* prop, const string& d
   }
   else {
     ok = false;
-    auto itexisting = m_featureTableDeviceLowerCase.find(typeLower);
-    if(itexisting != m_featureTableDeviceLowerCase.end()) {
-      existingFeature = &(itexisting->second->second);
+    auto itexist = m_featureTableDeviceLowerCase.find(typeLower);
+    if(itexist != m_featureTableDeviceLowerCase.end()) {
+      existingFeature = &(itexist->second->second);
     }
 
     if(existingFeature) {
-      LogMsg("M372", MCU(devName), SECTION("Device"), VAL("FEATURE", type), VAL("KNOWNFEATURE", itexisting->second->first), VAL("DESCR", existingFeature->defaultName), lineNo);
+      LogMsg("M372", MCU(devName), SECTION("Device"), VAL("FEATURE", type), VAL("KNOWNFEATURE", itexist->second->first), VAL("DESCR", existingFeature->defaultName), lineNo);
     }
     else {
       LogMsg("M371", MCU(devName), SECTION("Device"), VAL("FEATURE", type), lineNo);
@@ -719,13 +719,13 @@ bool ValidateSyntax::CheckFeatureBoard(RteItem* prop, const string& boardName)
   }
   else {
     ok = false;
-    auto itexisting = m_featureTableBoardLowerCase.find(typeLower);
-    if(itexisting != m_featureTableBoardLowerCase.end()) {
-      existingFeature = &(itexisting->second->second);
+    auto itexist = m_featureTableBoardLowerCase.find(typeLower);
+    if(itexist != m_featureTableBoardLowerCase.end()) {
+      existingFeature = &(itexist->second->second);
     }
 
     if(existingFeature) {
-      LogMsg("M372", MCU(boardName), SECTION("Board"), VAL("FEATURE", type), VAL("KNOWNFEATURE", itexisting->second->first), VAL("DESCR", existingFeature->defaultName), lineNo);
+      LogMsg("M372", MCU(boardName), SECTION("Board"), VAL("FEATURE", type), VAL("KNOWNFEATURE", itexist->second->first), VAL("DESCR", existingFeature->defaultName), lineNo);
     }
     else {
       LogMsg("M371", MCU(boardName), SECTION("Board"), VAL("FEATURE", type), lineNo);
@@ -1096,15 +1096,14 @@ bool ValidateSyntax::CheckBoardProperties(RteItem* boardItem, map<string, RteIte
   map<string, RteItem*> properties;
   map<string, RteItem*> allProperties = prevProperties;   // copy from previous recursion step
 
-  for(auto boardItem : boardItem->GetChildren()) {
-    RteItem* item = dynamic_cast<RteItem*>(boardItem);
+  for(auto item : boardItem->GetChildren()) {
     if(!item) {
       continue;
     }
 
     const string& tag = item->GetTag();
     if(tag == "feature") {
-      CheckAddBoardProperty(item, properties, boardItem->GetName());
+      CheckAddBoardProperty(item, properties, item->GetName());
     }
   }
 
@@ -1919,7 +1918,7 @@ bool ValidateSyntax::CheckRequirements_Packages(RteItem* requirement)
           }
 
           const string& pkName = pk->GetName();
-          const string& pkVendor = pk->GetAttribute("vendor"); //GetVendorName();
+          const string& pkVendor = pk->GetAttribute("vendor");
           const string& pkVersion = pk->GetVersionString();
 
           msg += "\n    ";