diff --git a/social/apps/tornado_app/routes.py b/social/apps/tornado_app/routes.py
index a9ff01385..30b78395b 100644
--- a/social/apps/tornado_app/routes.py
+++ b/social/apps/tornado_app/routes.py
@@ -1,6 +1,6 @@
 from tornado.web import url
 
-from handlers import AuthHandler, CompleteHandler, DisconnectHandler
+from .handlers import AuthHandler, CompleteHandler, DisconnectHandler
 
 
 SOCIAL_AUTH_ROUTES = [
diff --git a/social/strategies/tornado_strategy.py b/social/strategies/tornado_strategy.py
index 7e3f11252..5327569b4 100644
--- a/social/strategies/tornado_strategy.py
+++ b/social/strategies/tornado_strategy.py
@@ -1,4 +1,5 @@
 import json
+import six
 
 from tornado.template import Loader, Template
 
@@ -28,8 +29,8 @@ def get_setting(self, name):
 
     def request_data(self, merge=True):
         # Multiple valued arguments not supported yet
-        return dict((key, val[0])
-                for key, val in self.request.arguments.iteritems())
+        return dict((key, val[0].decode())
+                for key, val in six.iteritems(self.request.arguments))
 
     def request_host(self):
         return self.request.host