diff --git a/pisi/install.py b/pisi/install.py
index 076df6b1..43731eb8 100644
--- a/pisi/install.py
+++ b/pisi/install.py
@@ -46,12 +46,12 @@ def install(package_fn):
 
     # unzip package in place
     ui.info('Extracting files\n')
-    package.extract_dir_flat('install', config.destdir)
+    #package.extract_dir_flat('install', config.destdir)
     
     # update databases
 
     # installdb
-    installdb.install(metadata.packages[0].name,
-                      metadata.source.version,
-                      metadata.source.release,
+    installdb.install(metadata.package.name,
+                      metadata.package.version,
+                      metadata.package.release,
                       config.install_dir() + '/files.xml')
diff --git a/pisi/util.py b/pisi/util.py
index 80aa5220..02597446 100644
--- a/pisi/util.py
+++ b/pisi/util.py
@@ -79,7 +79,10 @@ def subpath(a, b):
 
 def removepathprefix(a, b):
     comps = remove_prefix(os.path.split(a), os.path.split(b))
-    return reduce(os.path.join, comps)
+    if len(comps) > 0:
+        return os.path.join(*tuple(comps))
+    else:
+        return ""
 
 # file/dir functions