diff --git a/arangod/Aql/ExecutionPlan.cpp b/arangod/Aql/ExecutionPlan.cpp
index 8ccedfb1af..0c25dd98f1 100644
--- a/arangod/Aql/ExecutionPlan.cpp
+++ b/arangod/Aql/ExecutionPlan.cpp
@@ -143,7 +143,9 @@ static std::unique_ptr<graph::BaseOptions> CreateTraversalOptions(
                                    "supported, with bfs: true due to "
                                    "unpredictable results.");
   }
-  return options;
+  std::unique_ptr<graph::BaseOptions> ret(options.get());
+  options.release();
+  return ret;
 }
 
 static std::unique_ptr<graph::BaseOptions> CreateShortestPathOptions(
@@ -171,7 +173,9 @@ static std::unique_ptr<graph::BaseOptions> CreateShortestPathOptions(
       }
     }
   }
-  return options;
+  std::unique_ptr<graph::BaseOptions> ret(options.get());
+  options.release();
+  return ret;
 }
 
 /// @brief create the plan
diff --git a/arangod/Aql/GraphNode.h b/arangod/Aql/GraphNode.h
index e5280353f7..1e23b7a48f 100644
--- a/arangod/Aql/GraphNode.h
+++ b/arangod/Aql/GraphNode.h
@@ -31,7 +31,7 @@
 namespace arangodb {
 
 namespace graph {
-class BaseOptions;
+struct BaseOptions;
 }
 
 namespace aql {
diff --git a/arangod/Aql/TraversalNode.h b/arangod/Aql/TraversalNode.h
index bce757e27e..012e414d0b 100644
--- a/arangod/Aql/TraversalNode.h
+++ b/arangod/Aql/TraversalNode.h
@@ -32,15 +32,15 @@
 namespace arangodb {
 
 namespace aql {
-class Collection;
+struct Collection;
 }
 
 namespace graph {
-class BaseOptions;
+struct BaseOptions;
 }
 
 namespace traverser {
-class TraverserOptions;
+struct TraverserOptions;
 }
 
 namespace aql {
diff --git a/arangod/Cluster/ClusterEdgeCursor.h b/arangod/Cluster/ClusterEdgeCursor.h
index f206b524a0..12994abd25 100644
--- a/arangod/Cluster/ClusterEdgeCursor.h
+++ b/arangod/Cluster/ClusterEdgeCursor.h
@@ -31,7 +31,7 @@ namespace arangodb {
 class CollectionNameResolver;
 
 namespace graph {
-class BaseOptions;
+struct BaseOptions;
 class ClusterTraverserCache;
 }
 
diff --git a/arangod/Graph/ClusterTraverserCache.h b/arangod/Graph/ClusterTraverserCache.h
index d6fcc646d2..e66bc5ca62 100644
--- a/arangod/Graph/ClusterTraverserCache.h
+++ b/arangod/Graph/ClusterTraverserCache.h
@@ -32,7 +32,7 @@ namespace arangodb {
 class StringRef;
 
 namespace aql {
-class AqlValue;
+struct AqlValue;
 }
 
 namespace transaction {
diff --git a/arangod/RocksDBEngine/RocksDBEngine.cpp b/arangod/RocksDBEngine/RocksDBEngine.cpp
index 12960656d3..f218bd2237 100644
--- a/arangod/RocksDBEngine/RocksDBEngine.cpp
+++ b/arangod/RocksDBEngine/RocksDBEngine.cpp
@@ -82,7 +82,6 @@ std::string const RocksDBEngine::FeatureName("RocksDBEngine");
 RocksDBEngine::RocksDBEngine(application_features::ApplicationServer* server)
     : StorageEngine(server, EngineName, FeatureName, new RocksDBIndexFactory()),
       _db(nullptr),
-      _replicationManager(nullptr),
       _cmp(new RocksDBComparator()),
       _maxTransactionSize((std::numeric_limits<uint64_t>::max)()),
       _intermediateTransactionCommitSize(32 * 1024 * 1024),