diff --git a/lib/copy_this/www/lib/nntp.php b/lib/copy_this/www/lib/nntp.php
index 03d4b7592..e039de7f1 100644
--- a/lib/copy_this/www/lib/nntp.php
+++ b/lib/copy_this/www/lib/nntp.php
@@ -183,8 +183,7 @@ class NNTP extends Net_NNTP_Client
 			// We are already connected to usenet. AND
 			$this->_isConnected() &&
 			// (If compression is wanted and on,                    OR    Compression is not wanted and off.) AND
-			(($compression && $this->compression) || (!$compression && !$this->compression)) &&
-			($this->currentServer === NNTP_SERVER)
+			(($compression && $this->compression)                   || (!$compression && !$this->compression))
 		) {
 			return true;
 		} else {
@@ -457,9 +456,10 @@ class NNTP extends Net_NNTP_Client
 			$iDents = 0;
 
 			// Loop over the message-ID's or article numbers.
-			foreach ($identifiers as $wanted) {
+			foreach ($identifiers as $m) {
+				$iDents++;
 				// Download the body.
-				$message = $this->getMessage($groupName, $wanted);
+				$message = $this->getMessage($groupName, $m);
 
 				// Append the body to $body.
 				if (!$this->isError($message)) {
diff --git a/python/fixreleasenames_threaded.py b/python/fixreleasenames_threaded.py
index 7afba7f23..dbd198cc1 100644
--- a/python/fixreleasenames_threaded.py
+++ b/python/fixreleasenames_threaded.py
@@ -66,7 +66,7 @@ elif len(sys.argv) > 1 and (sys.argv[1] == "filename"):
     datas = cur[0].fetchall()
 elif len(sys.argv) > 1 and (sys.argv[1] == "md5"):
     while len(datas) == 0 and maxtries >= -5:
-        run = "SELECT DISTINCT rel.ID FROM releases rel INNER JOIN releasefiles rf ON rel.ID = rf.releaseID WHERE isrenamed = 0 AND rel.dehashstatus BETWEEN %s AND 0 AND rel.passwordstatus >= -1 AND (ishashed = 1 OR rf.name REGEXP'[a-fA-F0-9]{32,40}') ORDER BY postdate ASC LIMIT %s"
+        run = "SELECT DISTINCT rel.ID FROM releases rel INNER JOIN releasefiles rf ON rel.ID = rf.releaseID WHERE isrenamed = 0 AND rel.dehashstatus BETWEEN %s AND 0 AND rel.passwordstatus >= -1 AND (ishashed = 1 OR rf.name REGEXP'[a-fA-F0-9]{32}' OR rf.name REGEXP'[a-fA-F0-9]{40}') ORDER BY postdate ASC LIMIT %s"
         cur[0].execute(run, (maxtries, int(perrun[0])*int(run_threads[0])))
         datas = cur[0].fetchall()
         maxtries = maxtries - 1