diff --git a/libraries/entropy/server/interfaces/mirrors.py b/libraries/entropy/server/interfaces/mirrors.py
index 55c07207e..6b8a134be 100644
--- a/libraries/entropy/server/interfaces/mirrors.py
+++ b/libraries/entropy/server/interfaces/mirrors.py
@@ -2552,7 +2552,7 @@ class Server(ServerNoticeBoardMixin):
             repo = repo)
         db_files = dbconn.listAllDownloads(do_sort = False,
             full_path = True)
-        db_files = set([os.path.basename(x) for x in db_files if \
+        db_files = set([x for x in db_files if \
             (self.Entropy.get_branch_from_download_relative_uri(x) == branch)])
 
         exclude = set()
@@ -2744,9 +2744,8 @@ class Server(ServerNoticeBoardMixin):
         m_broken_uris = set()
         for rel_path, myqueue in queue_map.items():
 
-            remote_dir = os.path.dirname(
-                self.Entropy.complete_remote_package_relative_path(
-                    rel_path, repo = repo))
+            remote_dir = self.Entropy.complete_remote_package_relative_path(
+                rel_path, repo = repo)
 
             uploader = self.TransceiverServerHandler(self.Entropy, [uri],
                 myqueue, critical_files = myqueue,
@@ -2814,9 +2813,8 @@ class Server(ServerNoticeBoardMixin):
         m_broken_uris = set()
         for rel_path, myqueue in queue_map.items():
 
-            remote_dir = os.path.dirname(
-                self.Entropy.complete_remote_package_relative_path(
-                    rel_path, repo = repo))
+            remote_dir = self.Entropy.complete_remote_package_relative_path(
+                rel_path, repo = repo)
 
             local_basedir = os.path.dirname(
                 self.Entropy.complete_local_package_path(rel_path,
diff --git a/libraries/entropy/server/transceivers.py b/libraries/entropy/server/transceivers.py
index f74d08604..91ffcd91e 100644
--- a/libraries/entropy/server/transceivers.py
+++ b/libraries/entropy/server/transceivers.py
@@ -342,17 +342,12 @@ class TransceiverServerHandler:
                 header = blue(" @@ ")
             )
 
-            branch = SystemSettings()['repositories']['branch']
-            my_path = os.path.join(
-                self.Entropy._get_remote_database_relative_path(self.repo),
-                branch)
-
             self.Entropy.output(
                 "[%s|%s] %s %s..." % (
                     blue(crippled_uri),
                     brown(action),
                     blue(_("setting directory to")),
-                    darkgreen(my_path),
+                    darkgreen(self.txc_basedir),
                 ),
                 importance = 0,
                 type = "info",