diff --git a/TODO b/TODO
index 94282e8eb..a18197917 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,9 @@ TODO list (for developers only):
 - build() and world(), on enzyme, add the support for whitelist+cron
 - build(), on enzyme, add license blacklist (packages that cannot be shipped in a binary form)
 - build(), on enzyme, if a package is not going to be installed anymore from an overlay, it must be notified
+- build(), on enzyme, quickpkg a package before running emerge(), in this case, if the API has been broken, we can easily query the user and fix it
 - system-wide: add free space check
+- reagent: tool to create the empty Entropy DB
 - activator: for the tidy module I need that reagent includes the SLOT variable.
 - activator tasks:
           - add/remove packages from the database
diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py
index b78073a38..bfb82fd3a 100644
--- a/libraries/entropyTools.py
+++ b/libraries/entropyTools.py
@@ -142,7 +142,6 @@ def syncRemoteDatabases():
     else:
 	etpDbLocalRevision = 0
     
-    
     downloadLatest = []
     uploadLatest = False
     uploadList = []
@@ -166,11 +165,14 @@ def syncRemoteDatabases():
 	    revisions = []
 	    for dbstat in etpDbRemotePaths:
 		revisions.append(dbstat[1])
-	    latestrevision = alphaSorter(revisions)[len(revisions)-1]
+	    if len(revisions) > 1:
+		latestrevision = alphaSorter(revisions)[len(revisions)-1]
+	    else:
+		latestrevision = revisions[0]
 	    for dbstat in etpDbRemotePaths:
 		if dbstat[1] == latestrevision:
 		    # found !
-		    downloadLatest.append(dbstat)
+		    downloadLatest = dbstat
 		    break
 	    # Now check if we need to upload back the files to the other mirrors
 	    #print "DEBUG: check the others, if they're also updated, quit"
@@ -237,7 +239,6 @@ def syncRemoteDatabases():
 	
     if (uploadLatest):
 	print_info(green(" * ")+red("Starting to update the needed mirrors ..."))
-	# FIXME: UploadList is wrong?!
 	_uploadList = []
 	for uri in etpConst['activatoruploaduris']:
 	    for list in uploadList: