diff --git a/include/fetch.hpp b/include/fetch.hpp
index a29195df6..b644fba2f 100644
--- a/include/fetch.hpp
+++ b/include/fetch.hpp
@@ -65,6 +65,7 @@ namespace mamba
         bool failed = false;
         int http_status = 10000;
         curl_off_t downloaded_size = 0;
+        curl_off_t avg_speed = 0;
         std::string final_url;
 
         std::string etag, mod, cache_control;
diff --git a/src/fetch.cpp b/src/fetch.cpp
index 317a1ce53..753b84677 100644
--- a/src/fetch.cpp
+++ b/src/fetch.cpp
@@ -87,6 +87,12 @@ namespace mamba
         auto now = std::chrono::steady_clock::now();
         if (now >= m_next_retry)
         {
+            if (fs::exists(m_filename))
+            {
+                m_file.close();
+                fs::remove(m_filename);
+                m_file.open(m_filename);
+            }
             init_curl_target(m_url);
             if (m_has_progress_bar)
             {
@@ -281,6 +287,13 @@ namespace mamba
     bool DownloadTarget::finalize()
     {
         char* effective_url = nullptr;
+
+        auto cres = curl_easy_getinfo(m_handle, CURLINFO_SPEED_DOWNLOAD_T, &avg_speed);
+        if (cres != CURLE_OK)
+        {
+            avg_speed = 0;
+        }
+
         curl_easy_getinfo(m_handle, CURLINFO_RESPONSE_CODE, &http_status);
         curl_easy_getinfo(m_handle, CURLINFO_EFFECTIVE_URL, &effective_url);
         curl_easy_getinfo(m_handle, CURLINFO_SIZE_DOWNLOAD_T, &downloaded_size);
diff --git a/src/transaction.cpp b/src/transaction.cpp
index 6799b8328..2b91f0a69 100644
--- a/src/transaction.cpp
+++ b/src/transaction.cpp
@@ -66,28 +66,30 @@ namespace mamba
     {
         Id unused;
 
-        curl_off_t avg_speed;
-        auto cres = curl_easy_getinfo(m_target->handle(), CURLINFO_SPEED_DOWNLOAD_T, &avg_speed);
-        if (cres != CURLE_OK)
-        {
-            avg_speed = 0;
-        }
-
         // Validation
         auto expected_size = solvable_lookup_num(m_solv, SOLVABLE_DOWNLOADSIZE, 0);
-        std::string sha256_check = solvable_lookup_checksum(m_solv, SOLVABLE_CHECKSUM, &unused);
-
         if (m_target->downloaded_size != expected_size)
         {
+            LOG_ERROR << "File not valid: file size doesn't match expectation " << m_tarball_path;
             throw std::runtime_error("File not valid: file size doesn't match expectation (" + std::string(m_tarball_path) + ")");
         }
-        if (!validate::sha256(m_tarball_path, sha256_check))
+        const char* sha256_check = solvable_lookup_checksum(m_solv, SOLVABLE_CHECKSUM, &unused);
+        if (sha256_check != nullptr && !validate::sha256(m_tarball_path, sha256_check))
         {
+            LOG_ERROR << "File not valid: SHA256 sum doesn't match expectation " << m_tarball_path;
             throw std::runtime_error("File not valid: SHA256 sum doesn't match expectation (" + std::string(m_tarball_path) + ")");
         }
+        else
+        {
+            const char* md5_check = solvable_lookup_checksum(m_solv, SOLVABLE_PKGID, &unused);
+            if (md5_check != nullptr && !validate::md5(m_tarball_path, md5_check))
+            {
+                LOG_ERROR << "File not valid: MD5 sum doesn't match expectation " << m_tarball_path;
+                throw std::runtime_error("File not valid: MD5 sum doesn't match expectation (" + std::string(m_tarball_path) + ")");
+            }
+        }
 
         m_progress_proxy.set_postfix("Waiting...");
-
         // Extract path is __not__ yet thread safe it seems...
         {
             std::lock_guard<std::mutex> lock(PackageDownloadExtractTarget::extract_mutex);
@@ -103,7 +105,7 @@ namespace mamba
         final_msg << " " << std::setw(12 + 2);
         to_human_readable_filesize(final_msg, expected_size);
         final_msg << " " << std::setw(6);
-        to_human_readable_filesize(final_msg, avg_speed);
+        to_human_readable_filesize(final_msg, m_target->avg_speed);
         final_msg << "/s";
         m_progress_proxy.mark_as_completed(final_msg.str());