diff --git a/pisi/package.py b/pisi/package.py
index c6c4a33d..3c18873d 100644
--- a/pisi/package.py
+++ b/pisi/package.py
@@ -100,7 +100,7 @@ class Package:
 
         self.metadata = MetaData()
         self.metadata.read( join(outdir, ctx.const.metadata_xml) )
-        errs = self.metadata.has_errors()
+        errs = self.metadata.errors()
         if errs:
             util.Checks.print_errors(errs)
             raise Error, _("MetaData format wrong")
diff --git a/pisi/packagedb.py b/pisi/packagedb.py
index fd6851f7..bbc2e72a 100644
--- a/pisi/packagedb.py
+++ b/pisi/packagedb.py
@@ -90,14 +90,14 @@ class PackageDB(object):
 packagedbs = {}
 
 def add_db(name):
-    packagedbs[name] = PackageDB('repo-' + name)
+    pisi.packagedb.packagedbs[name] = PackageDB('repo-' + name)
 
 def get_db(name):
-    return packagedbs[name]
+    return pisi.packagedb.packagedbs[name]
 
 def remove_db(name):
-    del packagedbs[name]
-    #erase database file
+    del pisi.packagedb.packagedbs[name]
+    #FIXME: erase database file?
     
 def has_package(name):
     repo = which_repo(name)
diff --git a/pisi/sourcedb.py b/pisi/sourcedb.py
index 3062946c..d6ad53cf 100644
--- a/pisi/sourcedb.py
+++ b/pisi/sourcedb.py
@@ -48,7 +48,7 @@ class SourceDB(object):
         return self.d[name]
 
     def add_source(self, source_info):
-        assert not source_info.has_errors()
+        assert not source_info.errors()
         name = str(source_info.name)
         self.d[name] = source_info