diff --git a/src/gen/db/upgrade.py b/src/gen/db/upgrade.py
index 2047a7643..3fe32630a 100644
--- a/src/gen/db/upgrade.py
+++ b/src/gen/db/upgrade.py
@@ -740,7 +740,7 @@ def convert_marker(self, marker_field):
     """Convert a marker into a tag."""
     marker = MarkerType()
     marker.unserialize(marker_field)
-    tag_name = str(marker)
+    tag_name = unicode(marker)
     
     if tag_name != '':
         if tag_name not in self.tags:
diff --git a/src/gui/views/tags.py b/src/gui/views/tags.py
index de424cb44..f221ca6bf 100644
--- a/src/gui/views/tags.py
+++ b/src/gui/views/tags.py
@@ -550,7 +550,7 @@ class EditTag(object):
         """
         Save the changes made to the tag.
         """
-        self.tag.set_name(self.entry.get_text())
+        self.tag.set_name(unicode(self.entry.get_text()))
         self.tag.set_color(self.color.get_color().to_string())
 
         if not self.tag.get_name():
diff --git a/src/plugins/tool/NotRelated.py b/src/plugins/tool/NotRelated.py
index 9d8e7fc3d..79e5e6d2f 100644
--- a/src/plugins/tool/NotRelated.py
+++ b/src/plugins/tool/NotRelated.py
@@ -241,7 +241,7 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
     def applyTagClicked(self, button) :
         progress    = None
         rows        = self.treeSelection.count_selected_rows()
-        tag_name    = self.tagcombo.get_active_text()
+        tag_name    = unicode(self.tagcombo.get_active_text())
 
         # start the db transaction
         with DbTxn("Tag not related", self.db) as transaction:
diff --git a/src/plugins/tool/TestcaseGenerator.py b/src/plugins/tool/TestcaseGenerator.py
index 291318117..a7bd48705 100644
--- a/src/plugins/tool/TestcaseGenerator.py
+++ b/src/plugins/tool/TestcaseGenerator.py
@@ -1804,12 +1804,12 @@ class TestcaseGenerator(tool.BatchTool):
         else:
             result = ""
         
-        if type <> self.TAG:
-            if self.options.handler.options_dict['specialchars']:
-                result = result + u"ä<ö&ü%ß'\""
-            if self.options.handler.options_dict['add_serial']:
-                result = result + "#+#%06d#-#" % self.text_serial_number
-                self.text_serial_number = self.text_serial_number + 1
+        if self.options.handler.options_dict['specialchars']:
+            result = result + u"ä<ö&ü%ß'\""
+
+        if self.options.handler.options_dict['add_serial'] and type <> self.TAG:
+            result = result + "#+#%06d#-#" % self.text_serial_number
+            self.text_serial_number = self.text_serial_number + 1
         
         if not type:
             type = self.SHORT