diff --git a/3rdParty/fuerte/src/vst.cpp b/3rdParty/fuerte/src/vst.cpp
index 197521b43c..35ce0b40f0 100644
--- a/3rdParty/fuerte/src/vst.cpp
+++ b/3rdParty/fuerte/src/vst.cpp
@@ -484,12 +484,10 @@ RequestHeader requestHeaderFromSlice(VPackSlice const& headerSlice) {
   header.restVerb =
       static_cast<RestVerb>(headerSlice.at(3).getInt());  // rest verb
   header.path = headerSlice.at(4).copyString();           // request (path)
-  for (auto const& it :
-       VPackObjectIterator(headerSlice.at(5))) {  // query params
+  for (auto it : VPackObjectIterator(headerSlice.at(5))) {  // query params
     header.parameters.emplace(it.key.copyString(), it.value.copyString());
   }
-  for (auto const& it :
-       VPackObjectIterator(headerSlice.at(6))) {  // meta (headers)
+  for (auto it : VPackObjectIterator(headerSlice.at(6))) {  // meta (headers)
     header.addMeta(it.key.copyString(), it.value.copyString());
   }
   return header;
diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp
index 507e1c3336..9733e099a2 100644
--- a/arangod/Cluster/ClusterMethods.cpp
+++ b/arangod/Cluster/ClusterMethods.cpp
@@ -1850,7 +1850,7 @@ int fetchEdgesFromEngines(transaction::Methods& trx,
         continue;
       }
       arangodb::velocypack::StringRef idRef(id);
-      auto resE = cache.insert({idRef, e});
+      auto resE = cache.emplace(idRef, e);
       if (resE.second) {
         // This edge is not yet cached.
         allCached = false;
@@ -1924,8 +1924,7 @@ int fetchEdgesFromEngines(
       // Response has invalid format
       return TRI_ERROR_HTTP_CORRUPTED_JSON;
     }
-    read += Helper::getNumericValue<size_t>(resSlice,
-                                                              "readIndex", 0);
+    read += Helper::getNumericValue<size_t>(resSlice, "readIndex", 0);
 
     bool allCached = true;
     VPackSlice edges = resSlice.get("edges");
@@ -1938,7 +1937,7 @@ int fetchEdgesFromEngines(
         continue;
       }
       arangodb::velocypack::StringRef idRef(id);
-      auto resE = cache.insert({idRef, e});
+      auto resE = cache.emplace(idRef, e);
       if (resE.second) {
         // This edge is not yet cached.
         allCached = false;
@@ -2021,7 +2020,7 @@ void fetchVerticesFromEngines(
     }
     
     bool cached = false;
-    for (auto const& pair : VPackObjectIterator(resSlice)) {
+    for (auto const& pair : VPackObjectIterator(resSlice, true)) {
       arangodb::velocypack::StringRef key(pair.key);
       if (vertexIds.erase(key) == 0) {
         // We either found the same vertex twice,
diff --git a/lib/Zip/unzip.cpp b/lib/Zip/unzip.cpp
index 363103c1ca..803c93678a 100644
--- a/lib/Zip/unzip.cpp
+++ b/lib/Zip/unzip.cpp
@@ -1085,7 +1085,7 @@ unzGetCurrentFileInfo(unzFile file, unz_file_info* pfile_info, char* szFileName,
     pfile_info->internal_fa = file_info64.internal_fa;
     pfile_info->external_fa = file_info64.external_fa;
 
-    pfile_info->tmu_date = file_info64.tmu_date,
+    pfile_info->tmu_date = file_info64.tmu_date;
 
     pfile_info->compressed_size = (uLong)file_info64.compressed_size;
     pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;