diff --git a/setup.py b/setup.py
index 991e89c09..6f991c430 100755
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 import platform
 import sys
 
-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
+deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six']
 
 if sys.version_info < (2,7):
     deps += ['importlib', "protobuf==3.4.0"]
diff --git a/yowsup/env/env.py b/yowsup/env/env.py
index c03e8002c..5ef42ecdb 100644
--- a/yowsup/env/env.py
+++ b/yowsup/env/env.py
@@ -13,7 +13,6 @@ def __init__(cls, name, bases, dct):
         super(YowsupEnvType, cls).__init__(name, bases, dct)
 
 class YowsupEnv(with_metaclass(YowsupEnvType, object)):
-    __metaclass__ = YowsupEnvType
     __ENVS = {}
     __CURR = None
 
diff --git a/yowsup/layers/protocol_media/picture.py b/yowsup/layers/protocol_media/picture.py
index 36fec459d..c81bba97d 100644
--- a/yowsup/layers/protocol_media/picture.py
+++ b/yowsup/layers/protocol_media/picture.py
@@ -1,5 +1,5 @@
 from yowsup.layers import YowLayer
-from yowsup import ProtocolTreeNode
+from yowsup.structs import ProtocolTreeNode
 from .mediadownloader import MediaDownloader
 import shutil, os, logging
 logger = logging.getLogger(__name__)