diff --git a/src/client/DownloadManager.cpp b/src/client/DownloadManager.cpp
index bd356d402..15026206a 100644
--- a/src/client/DownloadManager.cpp
+++ b/src/client/DownloadManager.cpp
@@ -38,7 +38,7 @@ void DownloadManager::Shutdown()
 	managerShutdown = true;
 	pthread_mutex_unlock(&downloadAddLock);
 	pthread_mutex_unlock(&downloadLock);
-	if (downloadThread != 0)
+	if (threadStarted)
 		pthread_join(downloadThread, NULL);
 }
 
diff --git a/src/client/HTTP.cpp b/src/client/HTTP.cpp
index 477d49882..16a268a91 100644
--- a/src/client/HTTP.cpp
+++ b/src/client/HTTP.cpp
@@ -946,7 +946,7 @@ std::string FindBoundary(std::map<std::string, std::string> parts, std::string b
 	for (std::map<std::string, std::string>::iterator iter = parts.begin(); iter != parts.end(); iter++)
 	{
 		// loop through every character in each part and search for the substring, adding 1 to map for every character found (character after the substring)
-		for (ssize_t j = 0; j < (ssize_t)((*iter).second.length())-blen; j++)
+		for (ssize_t j = 0; j < (ssize_t)((*iter).second.length()-blen); j++)
 			if (!blen || (*iter).second.substr(j, blen) == boundary)
 			{
 				unsigned char ch = (*iter).second[j+blen];