diff --git a/objectstore/DriveState.cpp b/objectstore/DriveState.cpp
index 1411bda7a349cb47b9443dd8d59b32b3e8983b13..015709a672d228814c6d037256e5e7af20a6e033 100644
--- a/objectstore/DriveState.cpp
+++ b/objectstore/DriveState.cpp
@@ -293,7 +293,7 @@ std::map<std::string, uint64_t> DriveState::getDiskSpaceReservations() {
 //------------------------------------------------------------------------------
 void DriveState::addDiskSpaceReservation(const std::string& diskSystemName, uint64_t bytes) {
   checkPayloadWritable();
-  for (auto dsr: *m_payload.mutable_disk_space_reservations()) {
+  for (auto &dsr: *m_payload.mutable_disk_space_reservations()) {
     if (dsr.disk_system_name() == diskSystemName) {
       dsr.set_reserved_bytes(dsr.reserved_bytes() + bytes);
       return;
@@ -310,7 +310,7 @@ void DriveState::addDiskSpaceReservation(const std::string& diskSystemName, uint
 void DriveState::substractDiskSpaceReservation(const std::string& diskSystemName, uint64_t bytes) {
   checkPayloadWritable();
   size_t index=0;
-  for (auto dsr: *m_payload.mutable_disk_space_reservations()) {
+  for (auto &dsr: *m_payload.mutable_disk_space_reservations()) {
     if (dsr.disk_system_name() == diskSystemName) {
       if (bytes > dsr.reserved_bytes())
         throw NegativeDiskSpaceReservationReached(
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 53a02d0c0ad500918deeceba4977feab3c2a26bb..78dd4916e18f03d3dc48ba1f3b8c25d7a0ea5e64 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -3901,6 +3901,7 @@ void OStoreDB::RetrieveMount::reserveDiskSpace(const DiskSpaceReservationRequest
           .add("objectName", ds.getAddressIfSet());
     lc.log(log::DEBUG, "In RetrieveMount::reserveDiskSpace(): state after reservation.");
   }
+  //TODO BUG HERE, see mountId=\"10\" in downloads/tpsrv0*
   ds.commit();
 }