diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py
index d4cdd7e04a..055bf22b1e 100644
--- a/src/calibre/ebooks/metadata/meta.py
+++ b/src/calibre/ebooks/metadata/meta.py
@@ -75,7 +75,7 @@ def get_metadata(stream, stream_type='lrf', use_libprs_metadata=False):
     base.smart_update(mi)
     if opf is not None:
         base.update(opf)
-    
+        
     return base
 
 def set_metadata(stream, mi, stream_type='lrf'):
diff --git a/src/calibre/ebooks/metadata/opf.py b/src/calibre/ebooks/metadata/opf.py
index a4906d94ea..021b63ac08 100644
--- a/src/calibre/ebooks/metadata/opf.py
+++ b/src/calibre/ebooks/metadata/opf.py
@@ -383,11 +383,8 @@ class OPF(MetaInformation):
         return ans
     
     def get_series(self):
-        xm = self.soup.package.metadata.find('x-metadata')
-        if not xm:
-            return None
-        s = xm.find('series')
-        if s:
+        s = self.soup.package.metadata.find('series')
+        if s is not None:
             return str(s.string).strip()
         return None
     
@@ -397,10 +394,7 @@ class OPF(MetaInformation):
         self._set_metadata_element('series', val, type='x-metadata')
     
     def get_series_index(self):
-        xm = self.soup.package.metadata.find('x-metadata')
-        if not xm:
-            return None
-        s = xm.find('series-index')
+        s = self.soup.package.metadata.find('series-index')
         if s:
             try:
                 return int(str(s.string).strip())
@@ -623,7 +617,6 @@ def main(args=sys.argv):
         mi.category = opts.category.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
     if opts.comment is not None:
         mi.comments = opts.comment.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
-    print mi
     mo = OPFCreator(os.getcwd(), mi)
     mo.render(open(args[1], 'wb'))
     return 0
diff --git a/src/calibre/library/database.py b/src/calibre/library/database.py
index 1b869463bf..61487b68a2 100644
--- a/src/calibre/library/database.py
+++ b/src/calibre/library/database.py
@@ -1404,7 +1404,7 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
                     cpath = os.path.join(base, cname)
                     open(cpath, 'wb').write(cover)
                     mi.cover = cname
-                f = open(os.path.join(base, name+'.opf'), 'wb')
+                f = open(os.path.join(base, sanitize_file_name(name)+'.opf'), 'wb')
                 mi.render(f)
                 f.close()