diff --git a/pisi/api.py b/pisi/api.py
index 8b484b88..37467231 100644
--- a/pisi/api.py
+++ b/pisi/api.py
@@ -197,7 +197,7 @@ def configure_pending():
                                         False,
                                         False)
                 pkg_path = util.join_path(ctx.config.lib_dir(),
-                                          'package/' + pkgname)
+                                          'package', pkgname)
                 m = MetaData()
                 metadata_path = util.join_path(pkg_path, ctx.const.metadata_xml)
                 m.read(metadata_path)
diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py
index 5702fe9b..978a2e60 100644
--- a/pisi/atomicoperations.py
+++ b/pisi/atomicoperations.py
@@ -329,7 +329,7 @@ class Remove(AtomicOperation):
             self.files = ctx.installdb.files(self.package_name)
         except pisi.Error, e:
             # for some reason file was deleted, we still allow removes!
-            ctx.ui.error(e)
+            ctx.ui.error(unicode(e))
             ctx.ui.warning(_('File list could not be read for package %s, continuing removal.') % package_name)
             self.files = Files()
 
@@ -471,7 +471,8 @@ def resurrect_package(package_fn):
 
     from os.path import exists
 
-    metadata_xml = util.join_path(ctx.config.lib_dir(), 'package/' + package_fn, ctx.const.metadata_xml)
+    metadata_xml = util.join_path(ctx.config.lib_dir(), 'package', 
+                                  package_fn, ctx.const.metadata_xml)
     if not exists(metadata_xml):
        raise Error, _("Metadata XML '%s' cannot be found") % metadata_xml
 
@@ -495,7 +496,8 @@ def resurrect_package(package_fn):
     if not passed:
         ctx.ui.info(_('* Adding \'%s\' to db... ') % (metadata.package.name), noln=True)
     
-    files_xml = util.join_path(ctx.config.lib_dir(), 'package/' + package_fn, ctx.const.files_xml)
+    files_xml = util.join_path(ctx.config.lib_dir(), 'package',
+                               package_fn, ctx.const.files_xml)
     if not exists(files_xml):
        raise Error, _("Files XML '%s' cannot be found") % files_xml
 
diff --git a/pisi/installdb.py b/pisi/installdb.py
index 27296a4f..3466ee30 100644
--- a/pisi/installdb.py
+++ b/pisi/installdb.py
@@ -93,7 +93,8 @@ class InstallDB:
         return files
 
     def pkg_dir(self, pkg, version, release):
-        return join(ctx.config.lib_dir(), 'package/' + pkg + '-' + version + '-' + release)
+        return join(ctx.config.lib_dir(), 'package', 
+                    pkg + '-' + version + '-' + release)
 
     def is_recorded(self, pkg, txn = None):
         pkg = str(pkg)
diff --git a/pisi/package.py b/pisi/package.py
index 2e436450..a1101e0f 100644
--- a/pisi/package.py
+++ b/pisi/package.py
@@ -115,7 +115,7 @@ class Package:
                      + self.metadata.package.version + '-' \
                      + self.metadata.package.release
 
-        return join( ctx.config.lib_dir(), packageDir)
+        return join( ctx.config.lib_dir(), 'package', packageDir)
 
     def comar_dir(self):
         return join(self.pkg_dir(), ctx.const.comar_dir)