diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 005c937826af4ab8c0fe3b77a2c7ef50a2e2b90d..c5284c30b47258d79e61bc520f3bf6d02d85f023 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -2097,7 +2097,7 @@ OStoreDB::RetrieveJob * OStoreDB::castFromSchedDBJob(SchedulerDatabase::Retrieve
   if (!ret) {
     std::string unexpectedType = typeid(*job).name();
     throw cta::exception::Exception(
-      "In OStoreDB::RetrieveMount::castFromSchedDBJob(): unexpected archive job type while casting: " + unexpectedType
+      "In OStoreDB::RetrieveMount::castFromSchedDBJob(): unexpected retrieve job type while casting: " + unexpectedType
     );
   }
   return ret;
@@ -2425,7 +2425,7 @@ void OStoreDB::ArchiveJob::failReport(const std::string& failureReason, log::Log
             "In ArchiveJob::failReport(): stored job in failed container for operator handling.");
       else
         lc.log(log::ERR,
-            "In ArchiveJob::failReport(): stored job in failed contained after unexpected next step.");
+            "In ArchiveJob::failReport(): stored job in failed container after unexpected next step.");
       return;
     }
   }
@@ -2775,7 +2775,7 @@ void OStoreDB::RetrieveJob::failReport(const std::string &failureReason, log::Lo
             "In RetrieveJob::failReport(): stored job in failed container for operator handling.");
       else
         lc.log(log::ERR,
-            "In RetrieveJob::failReport(): stored job in failed contained after unexpected next step.");
+            "In RetrieveJob::failReport(): stored job in failed container after unexpected next step.");
       return;
     }
   }
diff --git a/scheduler/OStoreDB/OStoreDB.hpp b/scheduler/OStoreDB/OStoreDB.hpp
index 0e48c8fe6c62fafd7dd976c85f077a7adac76141..7f26072dc1de8b52add431d85f1b54bed07d6a42 100644
--- a/scheduler/OStoreDB/OStoreDB.hpp
+++ b/scheduler/OStoreDB/OStoreDB.hpp
@@ -186,7 +186,7 @@ public:
     std::unique_ptr<objectstore::ArchiveRequest::AsyncTransferSuccessfulUpdater> m_succesfulTransferUpdater;
     std::unique_ptr<objectstore::ArchiveRequest::AsyncRequestDeleter> m_requestDeleter;
   };
-  friend class ArchiveJob;
+  //friend class ArchiveJob;
   static ArchiveJob * castFromSchedDBJob(SchedulerDatabase::ArchiveJob * job);
   
   /* === Retrieve Mount handling ============================================ */
diff --git a/scheduler/RetrieveMount.cpp b/scheduler/RetrieveMount.cpp
index efbae6fe14be6255e2dd397e290590f4fff1d02c..294b8bdbd2cc401cca339474fbcdfa9bb9ec7ae3 100644
--- a/scheduler/RetrieveMount.cpp
+++ b/scheduler/RetrieveMount.cpp
@@ -91,8 +91,8 @@ std::list<std::unique_ptr<cta::RetrieveJob> > cta::RetrieveMount::getNextJobBatc
 // waitAndFinishSettingJobsBatchRetrieved()
 //------------------------------------------------------------------------------
 void cta::RetrieveMount::waitAndFinishSettingJobsBatchRetrieved(std::queue<std::unique_ptr<cta::RetrieveJob> >& successfulRetrieveJobs, cta::log::LogContext& logContext) {
-  std::list<std::unique_ptr<cta::RetrieveJob> > validatedSuccessfulArchiveJobs;
-  std::list<cta::SchedulerDatabase::RetrieveJob *> validatedSuccessfulDBArchiveJobs;
+  std::list<std::unique_ptr<cta::RetrieveJob> > validatedSuccessfulRetrieveJobs;
+  std::list<cta::SchedulerDatabase::RetrieveJob *> validatedSuccessfulDBRetrieveJobs;
   std::unique_ptr<cta::RetrieveJob> job;
   double waitUpdateCompletionTime=0;
   double jobBatchFinishingTime=0;
@@ -108,13 +108,13 @@ void cta::RetrieveMount::waitAndFinishSettingJobsBatchRetrieved(std::queue<std::
       files++;
       bytes+=job->archiveFile.fileSize;
       job->checkComplete();
-      validatedSuccessfulDBArchiveJobs.emplace_back(job->m_dbJob.get());
-      validatedSuccessfulArchiveJobs.emplace_back(std::move(job));
+      validatedSuccessfulDBRetrieveJobs.emplace_back(job->m_dbJob.get());
+      validatedSuccessfulRetrieveJobs.emplace_back(std::move(job));
       job.reset();
     }
     waitUpdateCompletionTime=t.secs(utils::Timer::resetCounter);
     // Complete the cleaning up of the jobs in the mount
-    m_dbMount->finishSettingJobsBatchSuccessful(validatedSuccessfulDBArchiveJobs, logContext);
+    m_dbMount->finishSettingJobsBatchSuccessful(validatedSuccessfulDBRetrieveJobs, logContext);
     jobBatchFinishingTime=t.secs();
     schedulerDbTime=jobBatchFinishingTime + waitUpdateCompletionTime;
     {