diff --git a/pisi/context.py b/pisi/context.py
index 4799a7ba..2e8dd602 100644
--- a/pisi/context.py
+++ b/pisi/context.py
@@ -41,6 +41,8 @@ dbenv = None
 installdb = None
 packagedb = None
 repodb = None
+sourcedb = None
+filesdb = None
 invidx = None
 
 comar = None
diff --git a/pisi/operations.py b/pisi/operations.py
index 6829a945..20576ceb 100644
--- a/pisi/operations.py
+++ b/pisi/operations.py
@@ -435,8 +435,7 @@ def upgrade_pkg_names(A = []):
             continue
 
         if security_only:
-            history = ctx.packageDB.get_history(x)
-            updates = [i for i in history if pisi.version.Version(i.release) > pisi.version.Version(release)]
+            updates = [i for i in pkg.history if pisi.version.Version(i.release) > pisi.version.Version(release)]
             if not pisi.util.any(lambda i:i.type == 'security', updates):
                 continue