diff --git a/arangod/Indexes/EdgeIndex.cpp b/arangod/Indexes/EdgeIndex.cpp
index 14be99388a..325175f2f2 100644
--- a/arangod/Indexes/EdgeIndex.cpp
+++ b/arangod/Indexes/EdgeIndex.cpp
@@ -541,7 +541,7 @@ int EdgeIndex::batchInsert(arangodb::Transaction* trx,
 void EdgeIndex::lookup(arangodb::Transaction* trx,
                        TRI_edge_index_iterator_t const* edgeIndexIterator,
                        std::vector<TRI_doc_mptr_copy_t>& result,
-                       TRI_doc_mptr_copy_t*& next, size_t batchSize) {
+                       TRI_doc_mptr_t*& next, size_t batchSize) {
   auto callback =
       [&result](TRI_doc_mptr_t* data) -> void { result.emplace_back(*(data)); };
 
@@ -557,7 +557,7 @@ void EdgeIndex::lookup(arangodb::Transaction* trx,
       TRI_ASSERT(false);
     }
     if (found != nullptr && found->size() != 0) {
-      next = static_cast<TRI_doc_mptr_copy_t*>(found->back());
+      next = found->back();
     }
   } else {
     if (edgeIndexIterator->_direction == TRI_EDGE_OUT) {
@@ -568,7 +568,7 @@ void EdgeIndex::lookup(arangodb::Transaction* trx,
       TRI_ASSERT(false);
     }
     if (found != nullptr && found->size() != 0) {
-      next = static_cast<TRI_doc_mptr_copy_t*>(found->back());
+      next = found->back();
     } else {
       next = nullptr;
     }
diff --git a/arangod/Indexes/EdgeIndex.h b/arangod/Indexes/EdgeIndex.h
index c66417ae28..bc67a8ea00 100644
--- a/arangod/Indexes/EdgeIndex.h
+++ b/arangod/Indexes/EdgeIndex.h
@@ -124,7 +124,7 @@ class EdgeIndex final : public Index {
   //////////////////////////////////////////////////////////////////////////////
 
   void lookup(arangodb::Transaction*, TRI_edge_index_iterator_t const*,
-              std::vector<TRI_doc_mptr_copy_t>&, TRI_doc_mptr_copy_t*&, size_t);
+              std::vector<TRI_doc_mptr_copy_t>&, TRI_doc_mptr_t*&, size_t);
 
   int batchInsert(arangodb::Transaction*,
                   std::vector<TRI_doc_mptr_t const*> const*,
diff --git a/arangod/V8Server/V8Traverser.cpp b/arangod/V8Server/V8Traverser.cpp
index 3cf1643f48..d39358373f 100644
--- a/arangod/V8Server/V8Traverser.cpp
+++ b/arangod/V8Server/V8Traverser.cpp
@@ -932,7 +932,7 @@ void DepthFirstTraverser::setStartVertex(
       }
     }
   }
-  _enumerator.reset(new PathEnumerator<EdgeInfo, VertexId, TRI_doc_mptr_copy_t>(
+  _enumerator.reset(new PathEnumerator<EdgeInfo, VertexId, TRI_doc_mptr_t>(
       _edgeGetter, _getVertex, v));
   _done = false;
 }
@@ -981,7 +981,7 @@ EdgeIndex* DepthFirstTraverser::EdgeGetter::getEdgeIndex(
 
 void DepthFirstTraverser::EdgeGetter::operator()(VertexId const& startVertex,
                                                  std::vector<EdgeInfo>& edges,
-                                                 TRI_doc_mptr_copy_t*& last,
+                                                 TRI_doc_mptr_t*& last,
                                                  size_t& eColIdx, bool& dir) {
   std::string eColName;
   TRI_edge_direction_e direction;
diff --git a/arangod/V8Server/V8Traverser.h b/arangod/V8Server/V8Traverser.h
index 6c68864042..bf8b869a0b 100644
--- a/arangod/V8Server/V8Traverser.h
+++ b/arangod/V8Server/V8Traverser.h
@@ -213,7 +213,7 @@ class DepthFirstTraverser : public Traverser {
     //////////////////////////////////////////////////////////////////////////////
 
     void operator()(VertexId const&, std::vector<EdgeInfo>&,
-                    TRI_doc_mptr_copy_t*&, size_t&, bool&);
+                    TRI_doc_mptr_t*&, size_t&, bool&);
 
    private:
 
@@ -262,7 +262,7 @@ class DepthFirstTraverser : public Traverser {
   //////////////////////////////////////////////////////////////////////////////
 
   std::unique_ptr<arangodb::basics::PathEnumerator<
-      EdgeInfo, VertexId, TRI_doc_mptr_copy_t>> _enumerator;
+      EdgeInfo, VertexId, TRI_doc_mptr_t>> _enumerator;
 
   //////////////////////////////////////////////////////////////////////////////
   /// @brief internal getter to extract an edge