diff --git a/src/coordinator/coordinator_worker.hpp b/src/coordinator/coordinator_worker.hpp
index ec7410f8b..600ebdc31 100644
--- a/src/coordinator/coordinator_worker.hpp
+++ b/src/coordinator/coordinator_worker.hpp
@@ -141,8 +141,8 @@ class CoordinatorWorker {
     while (true) {
       Message message = queue_.Pop();
 
-      const bool should_continue =
-          std::visit([this](auto &&msg) { return Process(std::forward<decltype(msg)>(msg)); }, std::move(message));
+      const bool should_continue = std::visit(
+          [this](auto &&msg) { return this->Process(std::forward<decltype(msg)>(msg)); }, std::move(message));
 
       if (!should_continue) {
         return;
diff --git a/src/storage/v3/shard_manager.hpp b/src/storage/v3/shard_manager.hpp
index b8f93b509..a3dc8b9b6 100644
--- a/src/storage/v3/shard_manager.hpp
+++ b/src/storage/v3/shard_manager.hpp
@@ -183,7 +183,7 @@ class ShardManager {
     MG_ASSERT(address.last_known_ip == to.last_known_ip);
 
     SendToWorkerByUuid(to.unique_id, shard_worker::RouteMessage{
-                                         .message = std::forward<ShardMessages>(sm),
+                                         .message = std::move(sm),
                                          .request_id = request_id,
                                          .to = to,
                                          .from = from,