diff --git a/plugins/Stats/StatsPlugin.py b/plugins/Stats/StatsPlugin.py
index f58436cb..ccabed56 100644
--- a/plugins/Stats/StatsPlugin.py
+++ b/plugins/Stats/StatsPlugin.py
@@ -23,7 +23,7 @@ class UiRequestPlugin(object):
             else:
                 formatted = format % val
             back.append("<td>%s</td>" % formatted)
-        return "<tr class='%s'>%s</tr>" % (class_name, "".join(back))
+        return "<tr class='%s'>%s</tr>" % (class_name.encode("utf8"), "".join(back).encode("utf8"))
 
     def getObjSize(self, obj, hpy=None):
         if hpy:
@@ -39,6 +39,7 @@ class UiRequestPlugin(object):
         from Db import Db
         from Crypt import CryptConnection
 
+
         hpy = None
         if self.get.get("size") == "1":  # Calc obj size
             try:
@@ -162,9 +163,9 @@ class UiRequestPlugin(object):
             yield "</table>"
 
         # Tor hidden services
-        yield "<br><br><b>Tor hidden services (status: %s):</b><br>" % main.file_server.tor_manager.status
+        yield b"<br><br><b>Tor hidden services (status: %s):</b><br>" % main.file_server.tor_manager.status.encode("utf8")
         for site_address, onion in main.file_server.tor_manager.site_onions.items():
-            yield "- %-34s: %s<br>" % (site_address, onion)
+            yield "- %-34s: %s<br>" % (site_address, onion.encode("utf8"))
 
         # Db
         yield "<br><br><b>Db</b>:<br>"
diff --git a/src/Config.py b/src/Config.py
index d2124f0c..6214c90e 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -13,7 +13,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.6.4"
-        self.rev = 3829
+        self.rev = 3831
         self.argv = argv
         self.action = None
         self.pending_changes = {}
diff --git a/src/Site/Site.py b/src/Site/Site.py
index e388a074..1126d065 100644
--- a/src/Site/Site.py
+++ b/src/Site/Site.py
@@ -31,7 +31,7 @@ import SiteManager
 class Site(object):
 
     def __init__(self, address, allow_create=True, settings=None):
-        self.address = re.sub("[^A-Za-z0-9]", "", address)  # Make sure its correct address
+        self.address = str(re.sub("[^A-Za-z0-9]", "", address))  # Make sure its correct address
         self.address_hash = hashlib.sha256(self.address).digest()
         self.address_short = "%s..%s" % (self.address[:6], self.address[-4:])  # Short address for logging
         self.log = logging.getLogger("Site:%s" % self.address_short)