diff --git a/ddlproc/ddlproc.cpp b/ddlproc/ddlproc.cpp
index f203f85d3..de04fbeb1 100644
--- a/ddlproc/ddlproc.cpp
+++ b/ddlproc/ddlproc.cpp
@@ -133,7 +133,7 @@ int8_t setupCwd()
   string workdir = startup::StartUp::tmpDir();
 
   if (workdir.length() == 0)
-    workdir = ".";
+    workdir = std::string(".");
 
   int8_t rc = chdir(workdir.c_str());
   return rc;
diff --git a/versioning/BRM/extentmap.cpp b/versioning/BRM/extentmap.cpp
index bb2ea78ed..65078ca6a 100644
--- a/versioning/BRM/extentmap.cpp
+++ b/versioning/BRM/extentmap.cpp
@@ -1089,7 +1089,7 @@ void ExtentMap::mergeExtentsMaxMin(CPMaxMinMergeMap_t& cpMap, bool useLock)
     grabEMIndex(WRITE);
   }
 
-  for (it = cpMap.begin(); it != cpMap.end(); ++it)
+  for (auto it = cpMap.begin(); it != cpMap.end(); /* bottom erase will increase */)
   {
     auto emIt = findByLBID(it->first);
     if (emIt == fExtentMapRBTree->end())
@@ -1265,7 +1265,7 @@ void ExtentMap::mergeExtentsMaxMin(CPMaxMinMergeMap_t& cpMap, bool useLock)
       return;  // Leave when all extents in map are matched
 
     // Deleting objects from map, may speed up successive searches
-    cpMap.erase(it);
+    it = cpMap.erase(it);
   }
 
   throw logic_error("ExtentMap::mergeExtentsMaxMin(): lbid not found");