diff --git a/arangod/Ahuacatl/ahuacatl-parser-functions.cpp b/arangod/Ahuacatl/ahuacatl-parser-functions.cpp
index d468e90c6e..09e141843c 100644
--- a/arangod/Ahuacatl/ahuacatl-parser-functions.cpp
+++ b/arangod/Ahuacatl/ahuacatl-parser-functions.cpp
@@ -42,7 +42,7 @@
 /// @brief init the lexer
 ////////////////////////////////////////////////////////////////////////////////
 
-bool TRI_InitParserAql (TRI_aql_context_t* const context) {
+bool TRI_InitParserAql (TRI_aql_context_t* context) {
   assert(context);
   assert(context->_parser);
 
diff --git a/arangod/Ahuacatl/ahuacatl-parser-functions.h b/arangod/Ahuacatl/ahuacatl-parser-functions.h
index 06eeee70ab..e81256eac5 100644
--- a/arangod/Ahuacatl/ahuacatl-parser-functions.h
+++ b/arangod/Ahuacatl/ahuacatl-parser-functions.h
@@ -65,7 +65,7 @@ int Ahuacatllex_destroy (void *);
 /// @brief forward for the context function provided by the lexer (.l)
 ////////////////////////////////////////////////////////////////////////////////
 
-void Ahuacatlset_extra (TRI_aql_context_t* const, void*);
+void Ahuacatlset_extra (TRI_aql_context_t*, void*);
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
@@ -84,7 +84,7 @@ void Ahuacatlset_extra (TRI_aql_context_t* const, void*);
 /// @brief init the lexer
 ////////////////////////////////////////////////////////////////////////////////
 
-bool TRI_InitParserAql (TRI_aql_context_t* const);
+bool TRI_InitParserAql (TRI_aql_context_t*);
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief parse & validate the query string
diff --git a/arangod/Wal/LogfileManager.cpp b/arangod/Wal/LogfileManager.cpp
index aadad344c1..c5920646a9 100644
--- a/arangod/Wal/LogfileManager.cpp
+++ b/arangod/Wal/LogfileManager.cpp
@@ -131,7 +131,7 @@ LogfileManager* LogfileManager::instance () {
 /// @brief initialise the logfile manager instance
 ////////////////////////////////////////////////////////////////////////////////
 
-void LogfileManager::initialise (string* path) {
+void LogfileManager::initialise (std::string* path) {
   assert(Instance == nullptr);
 
   Instance = new LogfileManager(path);
diff --git a/arangod/Wal/Marker.cpp b/arangod/Wal/Marker.cpp
index f74dce64f8..a64b21f957 100644
--- a/arangod/Wal/Marker.cpp
+++ b/arangod/Wal/Marker.cpp
@@ -67,7 +67,7 @@ Marker::Marker (Marker const& other)
 Marker::Marker (TRI_df_marker_type_e type, 
                 size_t size) 
   : _buffer(new char[size]),
-    _size(size) {
+    _size(static_cast<uint32_t>(size)) {
 
   TRI_df_marker_t* m = reinterpret_cast<TRI_df_marker_t*>(begin());
   m->_type = type;
@@ -429,12 +429,11 @@ EdgeMarker EdgeMarker::clone (TRI_df_marker_t const* other,
   if (other->_type == TRI_DOC_MARKER_KEY_EDGE) {
     TRI_doc_edge_key_marker_t const* original = reinterpret_cast<TRI_doc_edge_key_marker_t const*>(other);
     
-    TRI_document_edge_t const edge = { 
-      ._fromCid    = original->_fromCid, 
-      ._toCid      = original->_toCid,
-      ._toKey      = (TRI_voc_key_t) base + original->_offsetToKey,
-      ._fromKey    = (TRI_voc_key_t) base + original->_offsetFromKey
-    };
+    TRI_document_edge_t edge;
+    edge._fromCid = original->_fromCid;
+    edge._toCid   = original->_toCid;
+    edge._toKey   = (TRI_voc_key_t) base + original->_offsetToKey;
+    edge._fromKey = (TRI_voc_key_t) base + original->_offsetFromKey;
     
     return EdgeMarker(databaseId,
                       collectionId,
@@ -453,12 +452,11 @@ EdgeMarker EdgeMarker::clone (TRI_df_marker_t const* other,
     assert(original->_databaseId == databaseId);
     assert(original->_collectionId == collectionId);
 
-    TRI_document_edge_t const edge = { 
-      ._fromCid    = original->_fromCid, 
-      ._toCid      = original->_toCid,
-      ._toKey      = (TRI_voc_key_t) base + original->_offsetToKey,
-      ._fromKey    = (TRI_voc_key_t) base + original->_offsetFromKey
-    };
+    TRI_document_edge_t edge;
+    edge._fromCid = original->_fromCid;
+    edge._toCid   = original->_toCid;
+    edge._toKey   = (TRI_voc_key_t) base + original->_offsetToKey;
+    edge._fromKey = (TRI_voc_key_t) base + original->_offsetFromKey;
 
     return EdgeMarker(original->_databaseId,
                       original->_collectionId,
diff --git a/lib/ShapedJson/Legends.cpp b/lib/ShapedJson/Legends.cpp
index 27ff8647de..8ea44778fa 100644
--- a/lib/ShapedJson/Legends.cpp
+++ b/lib/ShapedJson/Legends.cpp
@@ -269,6 +269,9 @@ size_t JsonLegend::getSize () const {
          + roundup8(_shape_data.length());          // shape data, padded
 }
 
+JsonLegend::AttributeComparerClass JsonLegend::AttributeComparerObject;
+JsonLegend::ShapeComparerClass JsonLegend::ShapeComparerObject;
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief dump the legend to the buffer pointed to by buf
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/lib/ShapedJson/Legends.h b/lib/ShapedJson/Legends.h
index 811f8d5bae..a96a5c2178 100644
--- a/lib/ShapedJson/Legends.h
+++ b/lib/ShapedJson/Legends.h
@@ -39,6 +39,7 @@
 
 namespace triagens {
   namespace basics {
+    
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief create a legend for one or more shaped json objects