diff --git a/pisi/build.py b/pisi/build.py
index 90e2f2b9..aab80d53 100644
--- a/pisi/build.py
+++ b/pisi/build.py
@@ -12,7 +12,8 @@ from ui import ui
 from context import ctx
 from sourcearchive import SourceArchive
 from files import Files, FileInfo
-from specfile import SpecFile, MetaData
+from specfile import SpecFile
+from metadata import MetaData
 
 class PisiBuildError(Exception):
     pass
diff --git a/pisi/metadata.py b/pisi/metadata.py
index ef9f8806..18f8809c 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -1,4 +1,6 @@
 
+import ui
+
 from xmlfile import *
 import specfile
 from specfile import SpecFile
diff --git a/pisi/package.py b/pisi/package.py
index bb3a15e6..e2338bbf 100644
--- a/pisi/package.py
+++ b/pisi/package.py
@@ -17,9 +17,9 @@ class Package:
         """extract entire package contents to directory"""
         extract_dir('', outdir)         # means package root
 
-    def extract_file(self, path, outdir):
+    def extract_files(self, paths, outdir):
         """extract file with path to outdir"""
-        impl.unpack_file(path, outdir)
+        impl.unpack_files(paths, outdir)
 
     def extract_dir(self, dir, outdir):
         """extract directory recursively, this function