diff --git a/rrs/tools/common.py b/rrs/tools/common.py
index 5ce852c..01c4785 100644
--- a/rrs/tools/common.py
+++ b/rrs/tools/common.py
@@ -103,9 +103,9 @@ def load_recipes(layerbranch, bitbakepath, fetchdir, settings, logger,
         sys.exit(1)
 
     layer = layerbranch.layer
-    urldir = layer.get_fetch_dir()
+    urldir = str(layer.get_fetch_dir())
     repodir = os.path.join(fetchdir, urldir)
-    layerdir = os.path.join(repodir, layerbranch.vcs_subdir)
+    layerdir = os.path.join(repodir, str(layerbranch.vcs_subdir))
 
     d = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir,
             layer, layerbranch)
diff --git a/rrs/tools/rrs_upgrade_history.py b/rrs/tools/rrs_upgrade_history.py
index ee0aa0c..65ae625 100755
--- a/rrs/tools/rrs_upgrade_history.py
+++ b/rrs/tools/rrs_upgrade_history.py
@@ -140,9 +140,9 @@ def _get_recipes_filenames(ct, repodir, layerdir, logger):
 
 def do_initial(layerbranch, ct, logger):
     layer = layerbranch.layer
-    urldir = layer.get_fetch_dir()
+    urldir = str(layer.get_fetch_dir())
     repodir = os.path.join(fetchdir, urldir)
-    layerdir = os.path.join(repodir, layerbranch.vcs_subdir)
+    layerdir = os.path.join(repodir, str(layerbranch.vcs_subdir))
 
     utils.runcmd("git checkout %s -b %s -f" % (ct, branch_name_tmp),
                     repodir, logger=logger)
@@ -163,9 +163,9 @@ def do_initial(layerbranch, ct, logger):
 
 def do_loop(layerbranch, ct, logger):
     layer = layerbranch.layer
-    urldir = layer.get_fetch_dir()
+    urldir = str(layer.get_fetch_dir())
     repodir = os.path.join(fetchdir, urldir)
-    layerdir = os.path.join(repodir, layerbranch.vcs_subdir)
+    layerdir = os.path.join(repodir, str(layerbranch.vcs_subdir))
 
     utils.runcmd("git checkout %s -b %s -f" % (ct, branch_name_tmp),
             repodir, logger=logger)