diff --git a/SystemTools.cxx b/SystemTools.cxx
index 38d87cbeb009f3fc6c3bfd2e4233e5e75bb390c1..084c611ab5523ebd6a0c870125157dd9f6d061a1 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2107,12 +2107,15 @@ kwsys_stl::string SystemTools
     SystemTools::GetPath(path);
     }
   // now add the additional paths
+  {
   for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin();
         i != userPaths.end(); ++i)
     {
     path.push_back(*i);
     }
+  }
   // Add a trailing slash to all paths to aid the search process.
+  {
   for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
       i != path.end(); ++i)
     {
@@ -2122,6 +2125,7 @@ kwsys_stl::string SystemTools
       p += "/";
       }
     }
+  }
   // now look for the file
   kwsys_stl::string tryPath;
   for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin();
@@ -2239,12 +2243,15 @@ kwsys_stl::string SystemTools::FindProgram(
     SystemTools::GetPath(path);
     }
   // now add the additional paths
+  {
   for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = 
         userPaths.begin();  i != userPaths.end(); ++i)
     {
     path.push_back(*i);
     }
+  }
   // Add a trailing slash to all paths to aid the search process.
+  {
   for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
       i != path.end(); ++i)
     {
@@ -2254,6 +2261,7 @@ kwsys_stl::string SystemTools::FindProgram(
       p += "/";
       }
     }
+  }
   // Try each path
   for(kwsys_stl::vector<kwsys_stl::string>::iterator p = path.begin();
       p != path.end(); ++p)
@@ -2331,12 +2339,15 @@ kwsys_stl::string SystemTools
   kwsys_stl::vector<kwsys_stl::string> path;
   SystemTools::GetPath(path);
    // now add the additional paths
+  {
   for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin();
         i != userPaths.end(); ++i)
     {
     path.push_back(*i);
     }
+  }
   // Add a trailing slash to all paths to aid the search process.
+  {
   for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
       i != path.end(); ++i)
     {
@@ -2346,6 +2357,7 @@ kwsys_stl::string SystemTools
       p += "/";
       }
     }
+  }
   kwsys_stl::string tryPath;
   for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin();
       p != path.end(); ++p)
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index f76b4e966aa7cdce7338737624ff637aab4be40e..870dc0b6e64b640bb7798d18eeb4903cebe51fb8 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2008)
 SET(KWSYS_DATE_STAMP_MONTH 01)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   20)
+SET(KWSYS_DATE_STAMP_DAY   21)