diff --git a/arangod/Aql/IndexBlock.h b/arangod/Aql/IndexBlock.h
index f17e335b99..9508e598ab 100644
--- a/arangod/Aql/IndexBlock.h
+++ b/arangod/Aql/IndexBlock.h
@@ -162,7 +162,7 @@ class IndexBlock final : public ExecutionBlock {
 
   /// @brief Counter how many documents have been returned/skipped
   ///        during one call.
-  size_t _returned;
+  uint64_t _returned;
 
   /// @brief Collect several AQLItemsBlocks
   BlockCollector _collector;
diff --git a/arangod/Cache/Table.cpp b/arangod/Cache/Table.cpp
index 59a2f01c97..8ff284ba9e 100644
--- a/arangod/Cache/Table.cpp
+++ b/arangod/Cache/Table.cpp
@@ -78,7 +78,7 @@ Table::Table(uint32_t logSize)
       _logSize(std::min(logSize, maxLogSize)),
       _size(static_cast<uint64_t>(1) << _logSize),
       _shift(32 - _logSize),
-      _mask((_size - 1) << _shift),
+      _mask((uint32_t)((_size - 1) << _shift)),
       _buffer(new uint8_t[(_size * BUCKET_SIZE) + Table::padding]),
       _buckets(reinterpret_cast<GenericBucket*>(
           reinterpret_cast<uint64_t>((_buffer.get() + 63)) &
diff --git a/arangod/Pregel/Algos/DMID/DMID.cpp b/arangod/Pregel/Algos/DMID/DMID.cpp
index 6a31157c15..ed63667755 100644
--- a/arangod/Pregel/Algos/DMID/DMID.cpp
+++ b/arangod/Pregel/Algos/DMID/DMID.cpp
@@ -86,7 +86,7 @@ static std::string const RESTART_COUNTER_AGG = "aggRestart";
 /** Maximum steps for the random walk, corresponds to t*. Default = 1000 */
 static uint64_t const RW_ITERATIONBOUND = 10;
 
-static const float PROFTIABILITY_DELTA = 0.3;
+static const float PROFTIABILITY_DELTA = 0.3f;
 
 static const bool LOG_AGGS = false;
 
@@ -523,7 +523,7 @@ struct DMIDComputation
             float const ttt = pair.second / getEdges().size();
             if (ttt > *threshold) {
               /** its profitable to become a member, set value */
-              vertexState->membershipDegree[pair.first] = 1.0 / std::pow(*iterationCounter / 3, 2);
+              vertexState->membershipDegree[pair.first] = 1.0f / std::pow(*iterationCounter / 3, 2);
               aggregate<bool>(NEW_MEMBER_AGG, true);
             }
           }
diff --git a/arangod/Pregel/Algos/EffectiveCloseness/HLLCounter.cpp b/arangod/Pregel/Algos/EffectiveCloseness/HLLCounter.cpp
index 13288cdfdb..bafb3ec589 100644
--- a/arangod/Pregel/Algos/EffectiveCloseness/HLLCounter.cpp
+++ b/arangod/Pregel/Algos/EffectiveCloseness/HLLCounter.cpp
@@ -34,7 +34,7 @@ using namespace arangodb::pregel;
 
 #else
 
-inline uint8_t _get_leading_zero_count(uint64_t x, uint8_t b) {
+inline uint8_t _get_leading_zero_count(uint32_t x, uint8_t b) {
   
 #if defined (_MSC_VER)
   unsigned long leading_zero_len = 32;
diff --git a/arangod/Pregel/Algos/LineRank.cpp b/arangod/Pregel/Algos/LineRank.cpp
index e64137e67f..20b61dd3a1 100644
--- a/arangod/Pregel/Algos/LineRank.cpp
+++ b/arangod/Pregel/Algos/LineRank.cpp
@@ -34,8 +34,8 @@ using namespace arangodb::pregel;
 using namespace arangodb::pregel::algos;
 
 static std::string const kMoreIterations = "more";
-static const double RESTART_PROB = 0.15;
-static const double EPS = 0.0000001;
+static const float RESTART_PROB = 0.15f;
+static const float EPS = 0.0000001f;
 
 LineRank::LineRank(arangodb::velocypack::Slice params)
     : SimpleAlgorithm("LineRank", params) {
@@ -81,7 +81,7 @@ struct LRComputation : public VertexComputation<float, float, float> {
         } else {
           newScore /= edges.size();
           newScore = ctx->startAtNodeProb * RESTART_PROB +
-                     newScore * (1.0 - RESTART_PROB);
+                     newScore * (1.0f - RESTART_PROB);
         }
 
         float diff = fabsf(newScore - *vertexValue);
diff --git a/arangod/Pregel/Algos/RecoveringPageRank.cpp b/arangod/Pregel/Algos/RecoveringPageRank.cpp
index 27aaa34d3d..f19f269a4a 100644
--- a/arangod/Pregel/Algos/RecoveringPageRank.cpp
+++ b/arangod/Pregel/Algos/RecoveringPageRank.cpp
@@ -32,7 +32,7 @@ using namespace arangodb;
 using namespace arangodb::pregel;
 using namespace arangodb::pregel::algos;
 
-static float EPS = 0.00001;
+static float EPS = 0.00001f;
 static std::string const kConvergence = "convergence";
 static std::string const kStep = "step";
 static std::string const kRank = "rank";
diff --git a/arangod/Pregel/CommonFormats.h b/arangod/Pregel/CommonFormats.h
index a155a4b900..97faa7e5cc 100644
--- a/arangod/Pregel/CommonFormats.h
+++ b/arangod/Pregel/CommonFormats.h
@@ -47,8 +47,8 @@ struct LPValue {
 /// Value for Hyperlink-Induced Topic Search (HITS; also known as
 /// hubs and authorities)
 struct HITSValue {
-  float authorityScore;
-  float hubScore;
+  double authorityScore;
+  double hubScore;
 };
 
 struct DMIDValue {
diff --git a/arangod/RocksDBEngine/RocksDBEngine.cpp b/arangod/RocksDBEngine/RocksDBEngine.cpp
index 1ceb4599f2..f99da7b243 100644
--- a/arangod/RocksDBEngine/RocksDBEngine.cpp
+++ b/arangod/RocksDBEngine/RocksDBEngine.cpp
@@ -125,7 +125,7 @@ void RocksDBEngine::start() {
   _options.create_if_missing = true;
   _options.max_open_files = -1;
   _options.comparator = _cmp.get();
-  _options.WAL_ttl_seconds = counter_sync_seconds * 2;
+  _options.WAL_ttl_seconds = (uint64_t)(counter_sync_seconds * 2.0);
   // TODO: prefix_extractior +  memtable_insert_with_hint_prefix
   
   rocksdb::Status status =