diff --git a/arangod/Cache/Cache.cpp b/arangod/Cache/Cache.cpp
index 989f0f90f5..dadc204562 100644
--- a/arangod/Cache/Cache.cpp
+++ b/arangod/Cache/Cache.cpp
@@ -164,9 +164,8 @@ bool Cache::isResizing() {
 }
 
 bool Cache::isShutdown() {
-  bool shutdown = false;
   _state.lock();
-  shutdown = !isOperational();
+  bool shutdown = !isOperational();
   _state.unlock();
 
   return shutdown;
diff --git a/arangod/Graph/AttributeWeightShortestPathFinder.cpp b/arangod/Graph/AttributeWeightShortestPathFinder.cpp
index 920cd452a7..2f63f73ecc 100644
--- a/arangod/Graph/AttributeWeightShortestPathFinder.cpp
+++ b/arangod/Graph/AttributeWeightShortestPathFinder.cpp
@@ -106,7 +106,7 @@ void AttributeWeightShortestPathFinder::SearcherTwoThreads::lookupPeer(
   // Did we find a solution on our own? This is for the
   // single thread case and for the case that the other
   // thread is too slow to even finish its own start vertex!
-  if (s->weight() == 0) {
+  if (s->weight() == 0.0) {
     // We have found the target, we have finished all
     // vertices with a smaller weight than this one (and did
     // not succeed), so this must be a best solution:
diff --git a/arangod/Graph/AttributeWeightShortestPathFinder.h b/arangod/Graph/AttributeWeightShortestPathFinder.h
index a2ee52167f..9834e2101c 100644
--- a/arangod/Graph/AttributeWeightShortestPathFinder.h
+++ b/arangod/Graph/AttributeWeightShortestPathFinder.h
@@ -52,7 +52,7 @@ class AttributeWeightShortestPathFinder : public ShortestPathFinder {
     arangodb::velocypack::Slice _edge;
     bool _done;
 
-    Step() : _done(false) {}
+    Step() : _weight(0.0), _done(false) {}
 
     Step(arangodb::velocypack::Slice const& vert,
          arangodb::velocypack::Slice const& pred, double weig,