diff --git a/arangod/Agency/FailedServer.cpp b/arangod/Agency/FailedServer.cpp
index 6ac05e2688..fac6262c21 100644
--- a/arangod/Agency/FailedServer.cpp
+++ b/arangod/Agency/FailedServer.cpp
@@ -190,7 +190,7 @@ bool FailedServer::create () {
   _jb->add("op", VPackValue("push"));
   _jb->add("new", VPackValue(_server));
   _jb->close();
-  
+
   // Raise plan version
   path = _agencyPrefix + planVersion;
   _jb->add(path, VPackValue(VPackValueType::Object));
diff --git a/arangod/Agency/Job.h b/arangod/Agency/Job.h
index 2afb1a7165..19e915baf7 100644
--- a/arangod/Agency/Job.h
+++ b/arangod/Agency/Job.h
@@ -45,8 +45,8 @@ static std::string const pendingPrefix  = "/Target/Pending/";
 static std::string const failedPrefix   = "/Target/Failed/";
 static std::string const finishedPrefix = "/Target/Finished/";
 static std::string const toDoPrefix     = "/Target/ToDo/";
-static std::string const cleanedPrefix  = "Target/CleanedServers";
-static std::string const failedServersPrefix  = "Target/FailedServers";
+static std::string const cleanedPrefix  = "/Target/CleanedServers";
+static std::string const failedServersPrefix  = "/Target/FailedServers";
 static std::string const planColPrefix  = "/Plan/Collections/";
 static std::string const curColPrefix   = "/Current/Collections/";
 static std::string const blockedServersPrefix = "/Supervision/DBServers/";
diff --git a/arangod/Agency/Supervision.cpp b/arangod/Agency/Supervision.cpp
index 3b57bbdb24..cb03e95304 100644
--- a/arangod/Agency/Supervision.cpp
+++ b/arangod/Agency/Supervision.cpp
@@ -612,7 +612,7 @@ bool Supervision::updateAgencyPrefix (size_t nTries, int intervalSec) {
   while (!this->isStopping()) {
     _snapshot = _agent->readDB().get("/");
     if (_snapshot.children().size() > 0) {
-      _agencyPrefix = std::string("/") + _snapshot.children().begin()->first;
+      _agencyPrefix = "/arango";//std::string("/") + _snapshot.children().begin()->first;
       LOG_TOPIC(DEBUG, Logger::AGENCY) << "Agency prefix is " << _agencyPrefix;
       return true;
     }
diff --git a/arangod/Cluster/ClusterInfo.cpp b/arangod/Cluster/ClusterInfo.cpp
index 13846e4fa5..c2b1aebed6 100644
--- a/arangod/Cluster/ClusterInfo.cpp
+++ b/arangod/Cluster/ClusterInfo.cpp
@@ -1103,7 +1103,7 @@ int ClusterInfo::createCollectionCoordinator(std::string const& databaseName,
   transaction.operations.push_back(createCollection);
   transaction.operations.push_back(increaseVersion);
   transaction.preconditions.push_back(precondition);
-  
+
   AgencyCommResult res = ac.sendTransactionWithFailover(transaction);
 
   if (!res.successful()) {
@@ -2051,6 +2051,8 @@ void ClusterInfo::loadCurrentCoordinators() {
 ////////////////////////////////////////////////////////////////////////////////
 
 static std::string const prefixCurrentDBServers = "Current/DBServers";
+static std::string const prefixTargetCleaned = "Target/CleanedOutServers";
+static std::string const prefixTargetFailed = "Target/FailedServers";
 
 void ClusterInfo::loadCurrentDBServers() {
   uint64_t storedVersion = _DBServersProt.version;
@@ -2062,17 +2064,50 @@ void ClusterInfo::loadCurrentDBServers() {
 
   // Now contact the agency:
   AgencyCommResult result = _agency.getValues(prefixCurrentDBServers);
+  AgencyCommResult failed = _agency.getValues(prefixTargetFailed);
+  AgencyCommResult cleaned = _agency.getValues(prefixTargetCleaned);
 
   if (result.successful()) {
 
     velocypack::Slice currentDBServers =
       result.slice()[0].get(std::vector<std::string>(
             {AgencyComm::prefix(), "Current", "DBServers"}));
+    velocypack::Slice failedDBServers =
+      failed.slice()[0].get(std::vector<std::string>(
+            {AgencyComm::prefix(), "Target", "FailedServers"}));
+    velocypack::Slice cleanedDBServers =
+      cleaned.slice()[0].get(std::vector<std::string>(
+            {AgencyComm::prefix(), "Target", "CleanedOutServers"}));
 
     if (currentDBServers.isObject()) {
       decltype(_DBServers) newDBServers;
 
       for (auto const& dbserver : VPackObjectIterator(currentDBServers)) {
+        if (failedDBServers.isArray()) {
+          bool found = false;
+          for (auto const& failedServer : VPackArrayIterator(failedDBServers)) {
+            if (dbserver.key == failedServer) {
+              found = true;
+              continue;
+            }
+          }
+          if (found) {
+            continue;
+          }
+        }
+        if (cleanedDBServers.isArray()) {
+          bool found = false;
+          for (auto const& cleanedServer : VPackArrayIterator(cleanedDBServers)) {
+            if (dbserver.key == cleanedServer) {
+              found = true;
+              continue;
+            }
+          }
+          if (found) {
+            continue;
+          }
+        }
+
         newDBServers.emplace(
           std::make_pair(dbserver.key.copyString(), dbserver.value.copyString()));
       }
diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp
index b86a144792..1a7dd5cbc6 100644
--- a/arangod/Cluster/ClusterMethods.cpp
+++ b/arangod/Cluster/ClusterMethods.cpp
@@ -1979,6 +1979,7 @@ std::map<std::string, std::vector<std::string>> distributeShards(
   std::map<std::string, std::vector<std::string>> shards;
 
   ClusterInfo*  ci = ClusterInfo::instance();
+  ci->loadCurrentDBServers();
   if (dbServers.size() == 0) {
     dbServers = ci->getCurrentDBServers();
     if (dbServers.empty()) {
diff --git a/scripts/startLocalCluster.sh b/scripts/startLocalCluster.sh
index e5a5141f19..5f90cfc900 100755
--- a/scripts/startLocalCluster.sh
+++ b/scripts/startLocalCluster.sh
@@ -83,6 +83,7 @@ for aid in `seq 0 $(( $NRAGENTS - 1 ))`; do
         --server.threads 16 \
         --agency.compaction-step-size $COMP \
         --log.force-direct true \
+        --log.level agency=debug \
         > cluster/$port.stdout 2>&1 &
 done