diff --git a/objectstore/Agent.cpp b/objectstore/Agent.cpp
index d857c14c5017da328bfa78a67dc2574e060205d2..10e36adc9ebab0cdbae0413077522f0523cae8eb 100644
--- a/objectstore/Agent.cpp
+++ b/objectstore/Agent.cpp
@@ -20,7 +20,7 @@
 #include "AgentRegister.hpp"
 #include "RootEntry.hpp"
 #include "common/exception/Errnum.hpp"
-#include "ProtcolBuffersAlgorithms.hpp"
+#include "ProtocolBuffersAlgorithms.hpp"
 #include <string>
 #include <sstream>
 #include <iomanip>
diff --git a/objectstore/AgentRegister.cpp b/objectstore/AgentRegister.cpp
index cb258356c33f1be5faa836f82fb0f2026646053c..ce92b8a85795120b1eae08c2f99e09ad4999b68a 100644
--- a/objectstore/AgentRegister.cpp
+++ b/objectstore/AgentRegister.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "AgentRegister.hpp"
-#include "ProtcolBuffersAlgorithms.hpp"
+#include "ProtocolBuffersAlgorithms.hpp"
 #include "GenericObject.hpp"
 
 cta::objectstore::AgentRegister::AgentRegister(Backend & os):
diff --git a/objectstore/DriveRegister.cpp b/objectstore/DriveRegister.cpp
index cbcda69978ef91ffd8d84cf5e48fcac13960cf19..f44f0dde283cb7ab4ea7e40853cefee1e479f6d5 100644
--- a/objectstore/DriveRegister.cpp
+++ b/objectstore/DriveRegister.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "DriveRegister.hpp"
-#include "ProtcolBuffersAlgorithms.hpp"
+#include "ProtocolBuffersAlgorithms.hpp"
 #include "GenericObject.hpp"
 
 cta::objectstore::DriveRegister::DriveRegister(const std::string & address, Backend & os):
diff --git a/objectstore/ProtocolBuffersAlgorithms.cpp b/objectstore/ProtocolBuffersAlgorithms.cpp
index 79b1195efc8e73b6b9c0de34beaaef041e22fa85..59a6590834416d8d5776ce15720b3452b2ad47a4 100644
--- a/objectstore/ProtocolBuffersAlgorithms.cpp
+++ b/objectstore/ProtocolBuffersAlgorithms.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ProtcolBuffersAlgorithms.hpp"
+#include "ProtocolBuffersAlgorithms.hpp"
 
 void cta::objectstore::serializers::removeString(::google::protobuf::RepeatedPtrField< ::std::string>* field, 
   const std::string & value) {
diff --git a/objectstore/ProtcolBuffersAlgorithms.hpp b/objectstore/ProtocolBuffersAlgorithms.hpp
similarity index 100%
rename from objectstore/ProtcolBuffersAlgorithms.hpp
rename to objectstore/ProtocolBuffersAlgorithms.hpp
diff --git a/objectstore/RootEntry.cpp b/objectstore/RootEntry.cpp
index 60524149f130f3918266108718298a015b141839..d3e6d90cc4e708117726c68be50521f785da5e43 100644
--- a/objectstore/RootEntry.cpp
+++ b/objectstore/RootEntry.cpp
@@ -22,7 +22,7 @@
 #include "TapePool.hpp"
 #include "DriveRegister.hpp"
 #include <cxxabi.h>
-#include "ProtcolBuffersAlgorithms.hpp"
+#include "ProtocolBuffersAlgorithms.hpp"
 
 // construtor, when the backend store exists.
 // Checks the existence and correctness of the root entry
diff --git a/objectstore/TapePool.cpp b/objectstore/TapePool.cpp
index 53db02bf75f4ac915860c3b779a80468ac3b89e2..2c739acf602331b525cf5e986d663250c081352b 100644
--- a/objectstore/TapePool.cpp
+++ b/objectstore/TapePool.cpp
@@ -18,7 +18,7 @@
 
 #include "TapePool.hpp"
 #include "GenericObject.hpp"
-#include "ProtcolBuffersAlgorithms.hpp"
+#include "ProtocolBuffersAlgorithms.hpp"
 #include "CreationLog.hpp"
 #include "Tape.hpp"
 
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 48e8ed81bb74c6d73477ea1040a0db2f21b91975..bbec9c3c3243a4ee065f64a17ff0c272b6db2a77 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -37,6 +37,7 @@
 #include "ArchiveToDirRequest.hpp"
 #include "RetrieveToFileRequest.hpp"
 #include "TapeCopyLocation.hpp"
+#include "RetrieveToDirRequest.hpp"
 #include <algorithm>
 #include <stdlib.h>     /* srand, rand */
 #include <time.h>       /* time */
@@ -514,7 +515,10 @@ void OStoreDB::queue(const cta::RetrieveToFileRequest& rqst) {
 }
 
 void OStoreDB::queue(const RetrieveToDirRequest& rqst) {
-  throw exception::Exception("Not Implemented");
+  auto & retrieveToFileRequests = rqst.getRetrieveToFileRequests();
+  for(auto req=retrieveToFileRequests.begin(); req!=retrieveToFileRequests.end(); req++) {
+    queue(*req);
+  }
 }
 
 std::list<RetrieveFromTapeCopyRequest> OStoreDB::getRetrieveRequests(const std::string& vid) const {