diff --git a/src/Worker/WorkerManager.py b/src/Worker/WorkerManager.py
index 0e5d3d44..2b8ba664 100644
--- a/src/Worker/WorkerManager.py
+++ b/src/Worker/WorkerManager.py
@@ -1,6 +1,5 @@
 import time
 import logging
-import random
 import collections
 
 import gevent
@@ -174,7 +173,10 @@ class WorkerManager(object):
             return False  # No task for workers
         if len(self.workers) >= self.getMaxWorkers() and not peers:
             return False  # Workers number already maxed and no starting peers defined
-        self.log.debug("Starting workers, tasks: %s, peers: %s, workers: %s" % (len(self.tasks), len(peers or []), len(self.workers)))
+        self.log.debug(
+            "Starting workers, tasks: %s, peers: %s, workers: %s" %
+            (len(self.tasks), len(peers or []), len(self.workers))
+        )
         if not peers:
             peers = self.site.getConnectedPeers()
             if len(peers) < self.getMaxWorkers():
@@ -183,7 +185,7 @@ class WorkerManager(object):
             peers = list(peers)
 
         # Sort by ping
-        peers.sort(key = lambda peer: peer.connection.last_ping_delay if peer.connection and len(peer.connection.waiting_requests) == 0 and peer.connection.connected else 9999)
+        peers.sort(key=lambda peer: peer.connection.last_ping_delay if peer.connection and len(peer.connection.waiting_requests) == 0 and peer.connection.connected else 9999)
 
         for peer in peers:  # One worker for every peer
             if peers and peer not in peers:
@@ -309,7 +311,10 @@ class WorkerManager(object):
                 self.startWorkers(found_peers, force_num=3)
 
         if len(found) < len(optional_hash_ids) or find_more:
-            self.log.debug("No connected hashtable result for optional files: %s" % (optional_hash_ids - set(found)))
+            self.log.debug(
+                "No connected hashtable result for optional files: %s (asked: %s)" %
+                (optional_hash_ids - set(found), len(self.asked_peers))
+            )
             if not self.tasks:
                 self.log.debug("No tasks, stopping finding optional peers")
                 return
@@ -346,7 +351,10 @@ class WorkerManager(object):
                     break
 
         if len(found) < len(optional_hash_ids):
-            self.log.debug("No findHash result, try random peers: %s" % (optional_hash_ids - set(found)))
+            self.log.debug(
+                "No findHash result, try random peers: %s (asked: %s)" %
+                (optional_hash_ids - set(found), len(self.asked_peers))
+            )
             # Try to query random peers
 
             if time_tasks != self.time_task_added:  # New task added since start
@@ -523,7 +531,10 @@ class WorkerManager(object):
         task["done"] = True
         self.tasks.remove(task)  # Remove from queue
         if task["optional_hash_id"]:
-            self.log.debug("Downloaded optional file in %.3fs, adding to hashfield: %s" % (time.time() - task["time_started"], task["inner_path"]))
+            self.log.debug(
+                "Downloaded optional file in %.3fs, adding to hashfield: %s" %
+                (time.time() - task["time_started"], task["inner_path"])
+            )
             self.site.content_manager.optionalDownloaded(task["inner_path"], task["optional_hash_id"], task["size"])
         self.site.onFileDone(task["inner_path"])
         task["evt"].set(True)