diff --git a/arangod/Wal/CollectorThread.h b/arangod/Wal/CollectorThread.h
index a7e1b185a0..caf18601e5 100644
--- a/arangod/Wal/CollectorThread.h
+++ b/arangod/Wal/CollectorThread.h
@@ -71,6 +71,9 @@ namespace triagens {
 // -----------------------------------------------------------------------------
 
     struct CollectorCache {
+      CollectorCache (CollectorCache const&) = delete;
+      CollectorCache& operator= (CollectorCache const&) = delete;
+
       explicit CollectorCache (TRI_voc_cid_t collectionId,
                                TRI_voc_tick_t databaseId,
                                Logfile* logfile,
diff --git a/lib/ShapedJson/shaped-json.cpp b/lib/ShapedJson/shaped-json.cpp
index fcaf28f6e7..b8c67b8ddb 100644
--- a/lib/ShapedJson/shaped-json.cpp
+++ b/lib/ShapedJson/shaped-json.cpp
@@ -1072,7 +1072,7 @@ static TRI_json_t* JsonShapeDataNumber (TRI_shaper_t* shaper,
                                         uint64_t size) {
   TRI_shape_number_t v;
 
-  v = * (TRI_shape_number_t const*) data;
+  v = * (TRI_shape_number_t const*) (void const*) data;
 
   return TRI_CreateNumberJson(shaper->_memoryZone, v);
 }
@@ -1561,7 +1561,7 @@ static bool StringifyJsonShapeDataNumber (TRI_shaper_t* shaper,
   TRI_shape_number_t v;
   int res;
 
-  v = * (TRI_shape_number_t const*) data;
+  v = * (TRI_shape_number_t const*) (void const*) data;
   // check for special values
 
   // yes, this is intentional
diff --git a/lib/SimpleHttpClient/SimpleHttpClient.cpp b/lib/SimpleHttpClient/SimpleHttpClient.cpp
index 7d68499aa2..985221dccc 100644
--- a/lib/SimpleHttpClient/SimpleHttpClient.cpp
+++ b/lib/SimpleHttpClient/SimpleHttpClient.cpp
@@ -54,17 +54,15 @@ namespace triagens {
       _readBuffer(TRI_UNKNOWN_MEM_ZONE),
       _requestTimeout(requestTimeout),
       _warn(warn),
-      _locationRewriter(),
+      _state(IN_CONNECT),
+      _written(0),
+      _errorMessage(""),
+      _locationRewriter({0, 0}),
       _nextChunkedSize(0),
-      _result(0), 
+      _result(nullptr), 
       _maxPacketSize(128 * 1024 * 1024),
       _keepAlive(true) {
 
-      _locationRewriter = { 0, 0 };
-      
-      _errorMessage = "";
-      _written = 0;
-      _state = IN_CONNECT;
       if (_connection->isConnected()) {
         _state = FINISHED;
       }
diff --git a/lib/V8/v8-utils.h b/lib/V8/v8-utils.h
index 42cde040e4..45af24cb47 100644
--- a/lib/V8/v8-utils.h
+++ b/lib/V8/v8-utils.h
@@ -55,8 +55,8 @@ class TRI_Utf8ValueNFC {
     ~TRI_Utf8ValueNFC ();
     
     // Disallow copying and assigning.
-    TRI_Utf8ValueNFC(const TRI_Utf8ValueNFC&) = delete;
-    void operator=(const TRI_Utf8ValueNFC&) = delete;
+    TRI_Utf8ValueNFC (TRI_Utf8ValueNFC const&) = delete;
+    TRI_Utf8ValueNFC& operator= (TRI_Utf8ValueNFC const&) = delete;
 
     inline char* operator* () { 
       return _str;