diff --git a/pisi-build b/pisi-build
index 2f182f23..7dda1d29 100755
--- a/pisi-build
+++ b/pisi-build
@@ -17,9 +17,9 @@ def main():
     # common options
 
     usage = "usage: %prog [options] package-name.pspec"
-    import pisi.commonargs
+    import pisi.cli.commonargs
     parser = OptionParser(usage=usage,version="%prog " + pisi.__version__)
-    pisi.commonargs.add(parser)
+    parser = pisi.cli.commonargs.add(parser)
 
     (options, args) = parser.parse_args()
 
diff --git a/pisi/metadata.py b/pisi/metadata.py
index 0aef1ded..2ca2b56e 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -50,7 +50,7 @@ class PackageInfo(specfile.PackageInfo):
         return node
 
     def verify(self):
-        super(PackageInfo, self).verify()
+        return specfile.PackageInfo.verify(self)
 
 class MetaData(XmlFile):
     """Package metadata. Metadata is composed of Specfile and various
diff --git a/tests/sandbox/metadata.xml b/tests/sandbox/metadata.xml
index 5bac2067..8875cc26 100644
--- a/tests/sandbox/metadata.xml
+++ b/tests/sandbox/metadata.xml
@@ -26,6 +26,11 @@
       <Release>1</Release>
     </Update>
   </History>
+  <Files>
+    <File>
+      <Path>/</Path>
+    </File>
+  </Files>
   <Distribution>Pardus</Distribution>
   <DistributionRelease>0.1</DistributionRelease>
   <Architecture>x86</Architecture>
diff --git a/tests/sandbox/sandbox.pspec b/tests/sandbox/sandbox.pspec
index a6d37898..05b1dcd1 100644
--- a/tests/sandbox/sandbox.pspec
+++ b/tests/sandbox/sandbox.pspec
@@ -29,5 +29,10 @@
     <Name>sandbox</Name>
     <Summary lang="tr">Bla</Summary>
     <Category>temprorary:zip</Category>
+    <Files>
+      <File>
+	<Path>/</Path>
+      </File>
+    </Files>
   </Package>
 </PISI>