diff --git a/arangod/Aql/EngineInfoContainerCoordinator.h b/arangod/Aql/EngineInfoContainerCoordinator.h
index 7aaae4356f..adc3134fdc 100644
--- a/arangod/Aql/EngineInfoContainerCoordinator.h
+++ b/arangod/Aql/EngineInfoContainerCoordinator.h
@@ -49,7 +49,9 @@ class EngineInfoContainerCoordinator {
    public:
     EngineInfo(QueryId id, size_t idOfRemoteNode);
     ~EngineInfo();
-
+#if (_MSC_VER != 0)
+#pragma warning( disable : 4521) // stfu wintendo.
+#endif
     EngineInfo(EngineInfo&) = delete;
     EngineInfo(EngineInfo const& other) = delete;
     EngineInfo(EngineInfo const&& other);
diff --git a/arangod/Aql/EngineInfoContainerDBServer.h b/arangod/Aql/EngineInfoContainerDBServer.h
index 9aa4e01cc3..6b33c08496 100644
--- a/arangod/Aql/EngineInfoContainerDBServer.h
+++ b/arangod/Aql/EngineInfoContainerDBServer.h
@@ -77,6 +77,9 @@ class EngineInfoContainerDBServer {
     explicit EngineInfo(size_t idOfRemoteNode);
     ~EngineInfo();
 
+#if (_MSC_VER != 0)
+#pragma warning( disable : 4521) // stfu wintendo.
+#endif
     EngineInfo(EngineInfo&) = delete;
     EngineInfo(EngineInfo const& other) = delete;
     EngineInfo(EngineInfo const&& other);
diff --git a/arangod/Aql/Functions.cpp b/arangod/Aql/Functions.cpp
index f291a7292d..b33c6af7e7 100644
--- a/arangod/Aql/Functions.cpp
+++ b/arangod/Aql/Functions.cpp
@@ -5699,7 +5699,7 @@ AqlValue Functions::CallApplyBackend(arangodb::aql::Query* query,
       // call parameters
       v8::Handle<v8::Array> params = v8::Array::New(isolate, static_cast<int>(n));
       
-      for (size_t i = 0; i < n; ++i) {
+      for (int i = 0; i < n; ++i) {
         params->Set(static_cast<uint32_t>(i), invokeParams[i].toV8(isolate, trx));
       }
       args[1] = params;
@@ -5707,7 +5707,7 @@ AqlValue Functions::CallApplyBackend(arangodb::aql::Query* query,
     } else {
       // a call to a built-in V8 function
       jsName = "AQL_" + func->nonAliasedName;
-      for (size_t i = 0; i < n; ++i) {
+      for (int i = 0; i < n; ++i) {
         args[i] = invokeParams[i].toV8(isolate, trx);
       }
     }
diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp
index 7a7b8a02fd..f448d37c57 100644
--- a/arangod/Cluster/ClusterMethods.cpp
+++ b/arangod/Cluster/ClusterMethods.cpp
@@ -2607,7 +2607,7 @@ std::shared_ptr<LogicalCollection> ClusterMethods::createCollectionOnCoordinator
     bool waitForSyncReplication,
     bool enforceReplicationFactor
 ) {
-  auto col = std::make_unique<LogicalCollection>(vocbase, parameters, 0, true);
+  auto col = std::make_unique<LogicalCollection>(vocbase, parameters, true, 0);
     // Collection is a temporary collection object that undergoes sanity checks etc.
     // It is not used anywhere and will be cleaned up after this call.
     // Persist collection will return the real object.