diff --git a/dvc/remote/base.py b/dvc/remote/base.py
index a4c24ed41..19031dac8 100644
--- a/dvc/remote/base.py
+++ b/dvc/remote/base.py
@@ -158,9 +158,7 @@ class RemoteBASE(object):
                     )
                 )
                 tasks = Tqdm(tasks, total=len(file_infos), unit="md5")
-            checksums = {
-                file_infos[index]: task for index, task in enumerate(tasks)
-            }
+            checksums = dict(zip(file_infos, tasks))
         return checksums
 
     def _collect_dir(self, path_info):
diff --git a/dvc/remote/local/__init__.py b/dvc/remote/local/__init__.py
index 48dea0062..8381e3511 100644
--- a/dvc/remote/local/__init__.py
+++ b/dvc/remote/local/__init__.py
@@ -545,7 +545,7 @@ class RemoteLOCAL(RemoteBASE):
     def _create_unpacked_dir(self, checksum, dir_info, unpacked_dir_info):
         self.makedirs(unpacked_dir_info)
 
-        for entry in Tqdm(dir_info, desc="Creating unpacked dir", unit="dir"):
+        for entry in Tqdm(dir_info, desc="Creating unpacked dir", unit="file"):
             entry_cache_info = self.checksum_to_path_info(
                 entry[self.PARAM_CHECKSUM]
             )