diff --git a/client/confTools.py b/client/confTools.py
index 07d8535e1..80a26855e 100644
--- a/client/confTools.py
+++ b/client/confTools.py
@@ -150,7 +150,7 @@ def update():
 		    continue
 		# end check
 		
-		diff = showdiff(scandata[cmd]['source'],scandata[cmd]['destination'])
+		diff = showdiff(scandata[cmd]['destination'],scandata[cmd]['source'])
 		if (not diff):
 		    print_info(darkred("Automerging file ")+darkgreen(scandata[cmd]['source']))
 		    os.rename(scandata[cmd]['source'],scandata[cmd]['destination'])
diff --git a/client/equoTools.py b/client/equoTools.py
index 6a066ac44..55b1f2e2c 100644
--- a/client/equoTools.py
+++ b/client/equoTools.py
@@ -2486,7 +2486,7 @@ def dependenciesTest(quiet = False, ask = False, pretend = False):
 	atom = clientDbconn.retrieveAtom(xidpackage)
 	if (not quiet):
 	    print_info(darkred(" @@ ")+bold("(")+blue(str(count))+"/"+red(length)+bold(")")+darkgreen(" Checking ")+bold(atom), back = True)
-	deptree, status = generateDependencyTree([xidpackage,0])
+	deptree, status = generateDependencyTree((xidpackage,0))
 
 	if (status == 0):
 	    # skip conflicts