diff --git a/generator/java.stoneg.py b/generator/java.stoneg.py
index 59c913c77..ef5ed8676 100644
--- a/generator/java.stoneg.py
+++ b/generator/java.stoneg.py
@@ -48,8 +48,9 @@
 )
 from stone.backend import CodeBackend
 
+@six.add_metaclass(abc.ABCMeta)
 class StoneType:
-    __metaclass__ = abc.ABCMeta
+    pass
 
 StoneType.register(ApiNamespace)
 StoneType.register(ApiRoute)
@@ -2265,7 +2266,7 @@ def __str__(self):
 
     def _as_json(self):
         dct = {}
-        for k, v in self.__dict__.iteritems():
+        for k, v in self.__dict__.items():
             # avoid cyclic references issue
             if isinstance(v, JavaReference):
                 dct[k] = v.fq_name
diff --git a/scripts/export-generated b/scripts/export-generated
index 3b6088e42..f5a534eb3 100755
--- a/scripts/export-generated
+++ b/scripts/export-generated
@@ -79,7 +79,7 @@ def get_files_in_repo(repo_path, exclude_ignored_files=False):
         ignored_files = subprocess.check_output(command, cwd=repo_path).split()
     else:
         ignored_files = []
-    return [file for file in files_list if file not in ignored_files]
+    return [file.decode('utf8') for file in files_list if file not in ignored_files]
 
 def strip_private_sections(path):
     """Delete everything in the file between the private repo tags"""
@@ -121,7 +121,7 @@ def main():
     """The entry point for the program."""
 
     args = _cmdline_parser.parse_args()
-    cwd = os.path.dirname(os.path.dirname(__file__))
+    cwd = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     repo_path = args.repo_path
     def log(msg):
         if args.verbose: