diff --git a/arangod/Agency/Agent.h b/arangod/Agency/Agent.h
index a3db2374c5..b09356f543 100644
--- a/arangod/Agency/Agent.h
+++ b/arangod/Agency/Agent.h
@@ -41,7 +41,7 @@ class Agent : public arangodb::Thread {
 
 public:
   /// @brief Construct with program options
-  Agent(config_t const&);
+  explicit Agent(config_t const&);
 
   /// @brief Clean up
   ~Agent();
diff --git a/arangod/Agency/Constituent.cpp b/arangod/Agency/Constituent.cpp
index a625e6837a..25d1ecc469 100644
--- a/arangod/Agency/Constituent.cpp
+++ b/arangod/Agency/Constituent.cpp
@@ -70,6 +70,8 @@ void Constituent::configure(Agent* agent) {
 // Default ctor
 Constituent::Constituent()
     : Thread("Constituent"),
+      _vocbase(nullptr),
+      _queryRegistry(nullptr),
       _term(0),
       _leaderID((std::numeric_limits<uint32_t>::max)()),
       _id(0),
diff --git a/arangod/Agency/NotifyCallback.h b/arangod/Agency/NotifyCallback.h
index 84750abec8..e306fd3514 100644
--- a/arangod/Agency/NotifyCallback.h
+++ b/arangod/Agency/NotifyCallback.h
@@ -35,7 +35,7 @@ class NotifyCallback : public arangodb::ClusterCommCallback {
   
 public:
   
-  NotifyCallback(std::function<void(bool)>);
+  explicit NotifyCallback(std::function<void(bool)>);
   
   virtual bool operator()(arangodb::ClusterCommResult*) override final;
   
diff --git a/arangod/Cluster/RestShardHandler.h b/arangod/Cluster/RestShardHandler.h
index 435e697a49..ecf9b77dd0 100644
--- a/arangod/Cluster/RestShardHandler.h
+++ b/arangod/Cluster/RestShardHandler.h
@@ -38,7 +38,7 @@ class Dispatcher;
 
 class RestShardHandler : public RestBaseHandler {
  public:
-  RestShardHandler(HttpRequest* request);
+  explicit RestShardHandler(HttpRequest* request);
 
  public:
   bool isDirect() const override;
diff --git a/arangod/Cluster/ServerJob.h b/arangod/Cluster/ServerJob.h
index 1ae391bc85..3ab50ef532 100644
--- a/arangod/Cluster/ServerJob.h
+++ b/arangod/Cluster/ServerJob.h
@@ -39,7 +39,7 @@ class ServerJob : public arangodb::rest::Job {
   ServerJob& operator=(ServerJob const&) = delete;
 
  public:
-  ServerJob(HeartbeatThread* heartbeat);
+  explicit ServerJob(HeartbeatThread* heartbeat);
   ~ServerJob();
 
  public:
diff --git a/arangod/RestHandler/RestQueryHandler.h b/arangod/RestHandler/RestQueryHandler.h
index 9151769857..9f7c4e49ee 100644
--- a/arangod/RestHandler/RestQueryHandler.h
+++ b/arangod/RestHandler/RestQueryHandler.h
@@ -35,7 +35,7 @@ namespace arangodb {
 
 class RestQueryHandler : public RestVocbaseBaseHandler {
  public:
-  RestQueryHandler(HttpRequest*);
+  explicit RestQueryHandler(HttpRequest*);
 
  public:
   bool isDirect() const override;
diff --git a/arangod/RestHandler/RestShutdownHandler.h b/arangod/RestHandler/RestShutdownHandler.h
index c0ab0d428f..a251fa08b2 100644
--- a/arangod/RestHandler/RestShutdownHandler.h
+++ b/arangod/RestHandler/RestShutdownHandler.h
@@ -37,7 +37,7 @@ namespace arangodb {
 
 class RestShutdownHandler : public RestBaseHandler {
  public:
-  RestShutdownHandler(HttpRequest*);
+  explicit RestShutdownHandler(HttpRequest*);
 
  public:
   bool isDirect() const override;
diff --git a/arangod/RestServer/AffinityFeature.cpp b/arangod/RestServer/AffinityFeature.cpp
index 0fa48a1df2..d673d18b6c 100644
--- a/arangod/RestServer/AffinityFeature.cpp
+++ b/arangod/RestServer/AffinityFeature.cpp
@@ -36,6 +36,7 @@ AffinityFeature::AffinityFeature(
     application_features::ApplicationServer* server)
     : ApplicationFeature(server, "Affinity"),
       _threadAffinity(0),
+      _n(0),
       _nd(0),
       _ns(0) {
   startsAfter("Logger");
diff --git a/arangod/Scheduler/SchedulerFeature.cpp b/arangod/Scheduler/SchedulerFeature.cpp
index 2eb8960f7b..6fed55d16b 100644
--- a/arangod/Scheduler/SchedulerFeature.cpp
+++ b/arangod/Scheduler/SchedulerFeature.cpp
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #endif
 
+#include "ApplicationFeatures/ApplicationServer.h"
 #include "Logger/LogAppender.h"
 #include "ProgramOptions/ProgramOptions.h"
 #include "ProgramOptions/Section.h"
@@ -67,9 +68,8 @@ void SchedulerFeature::collectOptions(
                      "number of threads for I/O scheduler",
                      new UInt64Parameter(&_nrSchedulerThreads));
 
-  std::unordered_set<uint64_t> backends = {0, 1, 2, 3, 4};
-
 #ifndef _WIN32
+  std::unordered_set<uint64_t> backends = {0, 1, 2, 3, 4};
   options->addHiddenOption(
       "--scheduler.backend", "1: select, 2: poll, 4: epoll",
       new DiscreteValuesParameter<UInt64Parameter>(&_backend, backends));
@@ -209,8 +209,8 @@ bool CtrlHandler(DWORD eventType) {
   if (!seen) {
     LOG(INFO) << "" << shutdownMessage << ", beginning shut down sequence";
 
-    if (SchedulerFeature::SCHEDULER != nullptr) {
-      SchedulerFeature::SCHEDULER->server()->beginShutdown();
+    if (application_features::ApplicationServer::server != nullptr) {
+      application_features::ApplicationServer::server->beginShutdown();
     }
 
     seen = true;
diff --git a/arangod/VocBase/server.cpp b/arangod/VocBase/server.cpp
index a2ab37a9e5..d05afa6fb7 100644
--- a/arangod/VocBase/server.cpp
+++ b/arangod/VocBase/server.cpp
@@ -2130,6 +2130,7 @@ TRI_vocbase_operationmode_e TRI_GetOperationModeServer() { return Mode; }
 
 TRI_server_t::TRI_server_t()
     : _databasesLists(new DatabasesLists()),
+      _databaseManagerStarted(false),
       _indexPool(nullptr),
       _queryRegistry(nullptr),
       _basePath(nullptr),
@@ -2137,6 +2138,7 @@ TRI_server_t::TRI_server_t()
       _lockFilename(nullptr),
       _serverIdFilename(nullptr),
       _disableReplicationAppliers(false),
+      _disableCompactor(false),
       _iterateMarkersOnOpen(false),
       _hasCreatedSystemDatabase(false),
       _initialized(false) {}
diff --git a/lib/Endpoint/Endpoint.cpp b/lib/Endpoint/Endpoint.cpp
index 1f6090e25e..905bde5930 100644
--- a/lib/Endpoint/Endpoint.cpp
+++ b/lib/Endpoint/Endpoint.cpp
@@ -53,7 +53,6 @@ Endpoint::Endpoint(DomainType domainType, EndpointType type,
 
 std::string Endpoint::uriForm (std::string const& endpoint) {
   static std::string illegal;
-  std::string unified = unifiedForm(endpoint);
 
   if (StringUtils::isPrefix(endpoint, "http+tcp://")) {
     return "http://" + endpoint.substr(11);