diff --git a/Common/DataModel/vtkCone.h b/Common/DataModel/vtkCone.h
index 3c80b2f41869a18339711a718303c060b2a19c79..a44b6247d1578b6d4423c2b11e7d993805953396 100644
--- a/Common/DataModel/vtkCone.h
+++ b/Common/DataModel/vtkCone.h
@@ -36,6 +36,7 @@ public:
   vtkTypeMacro(vtkCone, vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent) override;
 
+  using vtkImplicitFunction::EvaluateFunction;
   ///@{
   /**
    * Evaluate cone equation.
diff --git a/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.cxx b/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.cxx
index 1916b9654c67ce02eee68323b54d6d867309f283..26c30e6cb480a6cf9a43e984e7f323e76e14984a 100644
--- a/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.cxx
+++ b/Filters/FlowPaths/vtkAMRInterpolatedVelocityField.cxx
@@ -82,9 +82,7 @@ int vtkAMRInterpolatedVelocityField::SelfInitialize()
   {
     vectors = (gVectors
         ? gVectors
-        : vectors =
-            dataset->GetAttributesAsFieldData(this->VectorsType)->GetArray(this->VectorsSelection));
-
+        : dataset->GetAttributesAsFieldData(this->VectorsType)->GetArray(this->VectorsSelection));
     this->AddToDataSetsInfo(dataset, nullptr, vectors);
   }
 
diff --git a/IO/Exodus/vtkExodusIIWriter.cxx b/IO/Exodus/vtkExodusIIWriter.cxx
index a17699191e6b58f60e04c256efc558c5252751eb..94b04b7a37213478eef4cf4c467b9be760cb9343 100644
--- a/IO/Exodus/vtkExodusIIWriter.cxx
+++ b/IO/Exodus/vtkExodusIIWriter.cxx
@@ -2292,7 +2292,7 @@ std::string vtkExodusIIWriter::CreateNameForScalarArray(
   {
     std::string s(root);
     // assume largest for 32 bit decimal representation
-    char n[11];
+    char n[12];
     snprintf(n, sizeof(n), "%10d", component);
     s.append(n);
     return s;
diff --git a/IO/Image/vtkNIFTIImageReader.cxx b/IO/Image/vtkNIFTIImageReader.cxx
index 55472fe5b34a554fa9879e11478aac08ba9de68e..0a78b22a0f438a86411fa34b39dc309df3c632df 100644
--- a/IO/Image/vtkNIFTIImageReader.cxx
+++ b/IO/Image/vtkNIFTIImageReader.cxx
@@ -664,7 +664,8 @@ int vtkNIFTIImageReader::RequestInformation(vtkInformation* vtkNotUsed(request),
   int scalarType = 0;
   int numComponents = 0;
 
-  for (int i = 0; typeMap[2] != nullptr; i++)
+  // the end of the typemap has been reached when typeMap[i][2] is 0
+  for (int i = 0; typeMap[i][2] != 0; i++)
   {
     if (hdr2->datatype == typeMap[i][0])
     {
diff --git a/IO/Parallel/vtkNek5000Reader.cxx b/IO/Parallel/vtkNek5000Reader.cxx
index 212d7158452afd1089e39086d32c41abac0e7c78..343bf28542a6954797db6e0edc35b0cbffb91a1a 100644
--- a/IO/Parallel/vtkNek5000Reader.cxx
+++ b/IO/Parallel/vtkNek5000Reader.cxx
@@ -509,7 +509,7 @@ size_t vtkNek5000Reader::GetVariableNamesFromData(char* varTags)
       case 'S':
         for (int sloop = 0; sloop < numSFields; sloop++)
         {
-          char sname[4];
+          char sname[12];
           snprintf(sname, sizeof(sname), "S%02d", sloop + 1);
           this->PointDataArraySelection->AddArray(sname);
           this->var_names[this->num_vars] = strdup(sname);
diff --git a/Wrapping/Tools/vtkParseMain.c b/Wrapping/Tools/vtkParseMain.c
index 36711729ae98944131c99371ca9609775c2df30b..cebc640021f7e1c6f77fc34a3b198bf5e69a95f1 100644
--- a/Wrapping/Tools/vtkParseMain.c
+++ b/Wrapping/Tools/vtkParseMain.c
@@ -557,13 +557,13 @@ FileInfo* vtkParse_Main(int argc, char* argv[])
       if (!(hfile = vtkParse_FileOpen(hfilename, "r")))
       {
         fprintf(stderr, "Error opening hint file %s\n", hfilename);
-        fclose(ifile);
         vtkParse_FreeFile(data);
         exit(vtkParse_FinalizeMain(1));
       }
 
       /* fill in some blanks by using the hints file */
       vtkParse_ReadHints(data, hfile, stderr);
+      fclose(hfile);
     }
   }