diff --git a/Drone/copter_client.py b/Drone/copter_client.py
index d258358..fc6604c 100644
--- a/Drone/copter_client.py
+++ b/Drone/copter_client.py
@@ -162,7 +162,8 @@ class CopterClient(client.Client):
         trans.header.frame_id = "map"
         trans.child_frame_id = "gps"
         static_broadcaster.sendTransform(trans)
-        gps_frame_thread = threading.Thread(target=self.gps_frame_broadcast_loop, name="GPS frame broadcast thread", daemon=True)
+        gps_frame_thread = threading.Thread(target=self.gps_frame_broadcast_loop, name="GPS frame broadcast thread")
+        gps_frame_thread.daemon = True
         gps_frame_thread.start()
 
     def gps_frame_broadcast_loop(self):
@@ -966,11 +967,13 @@ class Telemetry:
     def start_loop(self):
         if copter.config.telemetry_frequency > 0:
             telemetry_thread = threading.Thread(target=self._update_loop, name="Telemetry getting thread",
-                                                args=(copter.config.telemetry_frequency,), daemon=True)  # TODO MOVE? Daemon?
-            slow_telemetry_thread = threading.Thread(target=self._slow_update_loop,
-                                                     name="Slow telemetry getting thread", daemon=True)
-            slow_telemetry_thread.start()
+                                                args=(copter.config.telemetry_frequency,))
+            telemetry_thread.daemon = True
             telemetry_thread.start()
+            slow_telemetry_thread = threading.Thread(target=self._slow_update_loop,
+                                                     name="Slow telemetry getting thread")
+            slow_telemetry_thread.daemon = True
+            slow_telemetry_thread.start()
         else:
             logger.info("Telemetry loop is not created because of zero or negative telemetry frequency")
 
diff --git a/Drone/tasking_lib.py b/Drone/tasking_lib.py
index 743e940..c64dbcb 100644
--- a/Drone/tasking_lib.py
+++ b/Drone/tasking_lib.py
@@ -31,8 +31,8 @@ class TaskManager(object):
         self.task_queue = []
         self._counter = itertools.count()     # unique sequence count
 
-        self._processor_thread = threading.Thread(target=self._task_processor, name="Task processing thread", daemon=True)
-        #self._processor_thread.daemon = True
+        self._processor_thread = threading.Thread(target=self._task_processor, name="Task processing thread")
+        self._processor_thread.daemon = True
         self._task_queue_lock = threading.RLock()
 
         self._running_event = threading.Event()