diff --git a/builder/assets/clever-show.service b/builder/assets/clever-show.service
index 3e6adeb..f993c18 100644
--- a/builder/assets/clever-show.service
+++ b/builder/assets/clever-show.service
@@ -6,7 +6,7 @@ After=clover.service
 [Service]
 WorkingDirectory=/home/pi/clever-show/drone
 ExecStart=/bin/bash -c ". /home/pi/catkin_ws/devel/setup.sh; \
-                      ROS_HOSTNAME=`hostname`.local /usr/bin/python /home/pi/clever-show/drone/client.py"
+                      ROS_HOSTNAME=`hostname`.local /usr/bin/python3 /home/pi/clever-show/drone/client.py"
 KillSignal=SIGKILL
 Restart=on-failure
 RestartSec=3
diff --git a/builder/assets/failsafe.service b/builder/assets/failsafe.service
index 50fd14a..2a84e3a 100644
--- a/builder/assets/failsafe.service
+++ b/builder/assets/failsafe.service
@@ -7,7 +7,7 @@ After=network.target
 User=pi
 WorkingDirectory=/home/pi/clever-show/drone
 ExecStart=/bin/bash -c ". /home/pi/catkin_ws/devel/setup.sh; \
-                      ROS_HOSTNAME=`hostname`.local /usr/bin/python /home/pi/clever-show/drone/failsafe.py"
+                      ROS_HOSTNAME=`hostname`.local /usr/bin/python3 /home/pi/clever-show/drone/failsafe.py"
 Restart=on-failure
 RestartSec=3
 
diff --git a/drone/client.py b/drone/client.py
index 3b8e635..cdde932 100644
--- a/drone/client.py
+++ b/drone/client.py
@@ -8,7 +8,6 @@ import logging
 import datetime
 import threading
 import subprocess
-from collections import namedtuple
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 
@@ -89,11 +88,11 @@ emergency = False
 
 logging.basicConfig(  # TODO all prints as logs
     level=logging.DEBUG,  # INFO
-    stream=sys.stdout,
     format="%(asctime)s [%(name)-7.7s] [%(threadName)-12.12s] [%(levelname)-5.5s]  %(message)s",
     handlers=[
         logging.StreamHandler(sys.stdout),
-    ])
+    ]
+    )
 
 handler = logging.StreamHandler(sys.stdout)
 handler.setLevel(logging.DEBUG)
@@ -763,7 +762,10 @@ class Telemetry:
 
     @classmethod
     def get_git_version(cls):
-        return subprocess.check_output("git log --pretty=format:'%h' -n 1", shell=True)
+        result = subprocess.check_output("git log --pretty=format:'%h' -n 1", shell=True, universal_newlines=True)
+        if isinstance(result, bytes):
+            result = result.decode("ascii")
+        return result.strip()
 
     @classmethod
     def get_config_version(cls):
diff --git a/drone/failsafe.py b/drone/failsafe.py
index e4e96ea..f1b6f48 100644
--- a/drone/failsafe.py
+++ b/drone/failsafe.py
@@ -41,7 +41,6 @@ emergency_land_decrease_thrust_after = config.emergency_land_decrease_thrust_aft
 
 logging.basicConfig(  # TODO all prints as logs
    level=logging.DEBUG, # INFO
-   stream=sys.stdout,
    format="%(asctime)s [%(name)-7.7s] [%(threadName)-12.12s] [%(levelname)-5.5s]  %(message)s",
    handlers=[
        logging.StreamHandler(sys.stdout),