diff --git a/packages/collectd/pybitmessagestatus.py b/packages/collectd/pybitmessagestatus.py
index d15c3a48..f82656f7 100644
--- a/packages/collectd/pybitmessagestatus.py
+++ b/packages/collectd/pybitmessagestatus.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python2.7
 
-import collectd
 import json
-import xmlrpclib
+
+import collectd
+from six.moves import xmlrpc_client as xmlrpclib
 
 pybmurl = ""
 api = ""
diff --git a/setup.py b/setup.py
index 30436bec..0a591d35 100644
--- a/setup.py
+++ b/setup.py
@@ -4,14 +4,14 @@ import os
 import platform
 import shutil
 import sys
-
 from importlib import import_module
-from setuptools import setup, Extension
+
+import six
+from setuptools import Extension, setup
 from setuptools.command.install import install
 
 from src.version import softwareVersion
 
-
 EXTRAS_REQUIRE = {
     'docs': ['sphinx'],
     'gir': ['pygobject'],
@@ -83,7 +83,7 @@ if __name__ == "__main__":
         'images/kivy/text_images*.png'
     ]}
 
-    if sys.version_info[0] == 3:
+    if six.PY3:
         packages.extend(
             [
                 'pybitmessage.bitmessagekivy',
diff --git a/src/api.py b/src/api.py
index 9f61f40b..d8c6609d 100644
--- a/src/api.py
+++ b/src/api.py
@@ -70,6 +70,7 @@ from struct import pack, unpack
 
 import six
 from six.moves import configparser, http_client, xmlrpc_server
+from six.moves.reprlib import repr
 
 import helper_inbox
 import helper_sent