diff --git a/src/mio/exception.py b/src/mio/exception.py
index 7a161c9d20c521a6b3581a8afba62d53a42eed71..8c25ee8921c3da804adf1dc2fa5afe4a7f1d5385 100755
--- a/src/mio/exception.py
+++ b/src/mio/exception.py
@@ -29,8 +29,8 @@ class SourceException(InstallerException):
     def __init__(self, decl_1, decl_2):
         self._1 = decl_1
         self._2 = decl_2
-        self.value_1 = "'%s'" % (decl_1.decl.source[0] or "")
-        self.value_2 = "'%s'" % (decl_2.decl.source[0] or "")
+        self.value_1 = "'%s'" % (decl_1.decl.source[0] or decl_1.name or "")
+        self.value_2 = "'%s'" % (decl_2.decl.source[0] or decl_2.name or "")
 
 class ModeException(InstallerException):
     def __init__(self, decl_1, decl_2):
diff --git a/src/mio/node.py b/src/mio/node.py
index 64232646d0216266145442b30fa80fad16c12dbb..d926e6bc5fc1542190af59749d51c7fc636c06ff 100755
--- a/src/mio/node.py
+++ b/src/mio/node.py
@@ -240,6 +240,8 @@ class file_node(target_node):
             raise ModeException(self, other)
         if self.decl.source[0] != other.decl.source[0]:
             raise SourceException(self, other)
+        if self.decl.files[0:] != other.decl.files[0:]:
+            raise SourceException(self, other)
         if self.uid != other.uid:
             raise OwnerException(self, other)
         if self.gid != other.gid:
diff --git a/src/mio/rpmDB.py b/src/mio/rpmDB.py
index ea69d18cdd84fa1ef45fbbecb27b1eea3304340c..15908fa2357a8cfe2cc1a2786436bf2364a6335f 100755
--- a/src/mio/rpmDB.py
+++ b/src/mio/rpmDB.py
@@ -9,14 +9,6 @@ class VersionDB:
     def __init__(self):
         self.rpm = {}
         try:
-            #rpmdb = rpmUtils.RpmDBHolder()
-            #read_ts = rpmUtils.transaction.initReadOnlyTransaction()
-            #rpmdb.addDB(read_ts)
-            #for (name, arch, epoch, version, release) in  rpmdb.getPkgList():
-            #    self.rpm[name] = (name, arch, version, release)
-            #del rpmdb
-            #del read_ts.ts
-            #del read_ts
             read_ts = rpmUtils.transaction.initReadOnlyTransaction()
             for e in read_ts.dbMatch():
                 (name, arch, version, release) = (