diff --git a/include/wrench/simgrid_S4U_util/S4U_CommPort.h b/include/wrench/simgrid_S4U_util/S4U_CommPort.h
index 49ec4d296f..d39797336a 100755
--- a/include/wrench/simgrid_S4U_util/S4U_CommPort.h
+++ b/include/wrench/simgrid_S4U_util/S4U_CommPort.h
@@ -63,14 +63,14 @@ namespace wrench {
         std::unique_ptr<TMessageType> getMessage(const std::string &error_prefix = "") {
             auto id = ++messageCounter;
 #ifndef NDEBUG
-            auto tn = this->templateWaitingLog(get_type_name<TMessageType>(), id);
+            this->templateWaitingLog(get_type_name<TMessageType>(), id);
 #endif
 
             auto message = this->getMessage(false);
 
             if (auto msg = dynamic_cast<TMessageType *>(message.get())) {
 #ifndef NDEBUG
-                this->templateWaitingLogUpdate(tn, id);
+                this->templateWaitingLogUpdate(get_type_name<TMessageType>(), id);
 #endif
                 message.release();
                 return std::unique_ptr<TMessageType>(msg);
diff --git a/src/wrench/services/storage/compound/CompoundStorageService.cpp b/src/wrench/services/storage/compound/CompoundStorageService.cpp
index dff9becaf6..1d4a66fab1 100644
--- a/src/wrench/services/storage/compound/CompoundStorageService.cpp
+++ b/src/wrench/services/storage/compound/CompoundStorageService.cpp
@@ -846,7 +846,7 @@ namespace wrench {
 
         auto recv = 0;
         while (recv < request_count) {
-            // Wait for answer to current reqeust
+            // Wait for answer to current request
             auto msg = recv_commport->getMessage<StorageServiceFileWriteAnswerMessage>(this->network_timeout, "CSS::writeFile(): ");
             if (not msg->success)
                 throw ExecutionException(msg->failure_cause);
@@ -880,7 +880,7 @@ namespace wrench {
         }
 
         WRENCH_INFO("CSS::writeFile(): Waiting for final acks");
-        for (const auto &mailbx_msg: messages) {
+        for (const auto &mailbox_msg: messages) {
             recv_commport->getMessage<StorageServiceAckMessage>("CSS::writeFile(): ");
         }
         S4U_CommPort::retireTemporaryCommPort(recv_commport);