diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 225bf41017..d9b3b9befd 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -1,7 +1,7 @@
 ''' E-book management software'''
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-__version__   = '0.4.74'
+__version__   = '0.4.75'
 __docformat__ = "epytext"
 __author__    = "Kovid Goyal <kovid at kovidgoyal.net>"
 __appname__   = 'calibre'
diff --git a/src/calibre/ebooks/metadata/__init__.py b/src/calibre/ebooks/metadata/__init__.py
index a511d6087a..c661890d88 100644
--- a/src/calibre/ebooks/metadata/__init__.py
+++ b/src/calibre/ebooks/metadata/__init__.py
@@ -6,7 +6,7 @@ __docformat__ = 'restructuredtext en'
 """
 Provides abstraction for metadata reading.writing from a variety of ebook formats. 
 """
-import os, mimetypes
+import os, mimetypes, sys
 from urllib import unquote, quote
 from urlparse import urlparse
 
@@ -55,6 +55,8 @@ class Resource(object):
             path = href_or_path
             if not os.path.isabs(path):
                 path = os.path.abspath(os.path.join(path, basedir))
+            if isinstance(path, str):
+                path = path.decode(sys.getfilesystemencoding())
             self.path = path
         else:
             url = urlparse(href_or_path)
diff --git a/src/calibre/library/database.py b/src/calibre/library/database.py
index d80917108e..d3f4654969 100644
--- a/src/calibre/library/database.py
+++ b/src/calibre/library/database.py
@@ -1421,7 +1421,6 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
                 name = au + ' - ' + title if byauthor else title + ' - ' + au
                 name += '_'+id
                 base  = dir if single_dir else tpath
-                
                 mi = OPFCreator(base, self.get_metadata(idx, index_is_id=index_is_id))
                 cover = self.cover(idx, index_is_id=index_is_id)
                 if cover is not None:
diff --git a/src/calibre/manual/custom.py b/src/calibre/manual/custom.py
index a617b5a9af..2098369fee 100644
--- a/src/calibre/manual/custom.py
+++ b/src/calibre/manual/custom.py
@@ -10,7 +10,7 @@ from sphinx.ext.autodoc import get_module_charset, prepare_docstring
 from docutils.statemachine import ViewList
 from docutils import nodes
 
-from genshi.template import OldTextTemplate
+from genshi.template import OldTextTemplate as TextTemplate
 sys.path.append(os.path.abspath('../../../'))
 from calibre.linux import entry_points