diff --git a/src/AiFactory.cpp b/src/AiFactory.cpp
index a7471a3d..72669e93 100644
--- a/src/AiFactory.cpp
+++ b/src/AiFactory.cpp
@@ -251,7 +251,7 @@ std::string AiFactory::GetPlayerSpecName(Player* player)
             break;
     }
 
-    return std::move(specName);
+    return specName;
 }
 
 void AiFactory::AddDefaultCombatStrategies(Player* player, PlayerbotAI* const facade, Engine* engine)
diff --git a/src/PlayerbotTextMgr.h b/src/PlayerbotTextMgr.h
index fc94b068..f5dcfd84 100644
--- a/src/PlayerbotTextMgr.h
+++ b/src/PlayerbotTextMgr.h
@@ -24,7 +24,7 @@ struct BotTextEntry
 
 struct ChatReplyData
 {
-    ChatReplyData(uint32 guid, uint32 type, std::string chat) : m_guid(guid), m_type(type), m_chat(chat) {}
+    ChatReplyData(uint32 guid, uint32 type, std::string chat) : m_type(type), m_guid(guid), m_chat(chat) {}
     uint32 m_type, m_guid = 0;
     std::string m_chat = "";
 };
diff --git a/src/strategy/NamedObjectContext.h b/src/strategy/NamedObjectContext.h
index a0db2207..a288a59c 100644
--- a/src/strategy/NamedObjectContext.h
+++ b/src/strategy/NamedObjectContext.h
@@ -80,7 +80,7 @@ class NamedObjectFactory
             for (typename std::map<std::string, ActionCreator>::iterator it = creators.begin(); it != creators.end(); it++)
                 keys.insert(it->first);
 
-            return std::move(keys);
+            return keys;
         }
 };
 
@@ -142,7 +142,7 @@ class NamedObjectContext : public NamedObjectFactory<T>
             for (typename std::map<std::string, T*>::iterator it = created.begin(); it != created.end(); it++)
                 keys.insert(it->first);
 
-            return std::move(keys);
+            return keys;
         }
 
     protected:
@@ -214,7 +214,7 @@ class NamedObjectContextList
                 return supported;
             }
 
-            return std::move(std::set<std::string>());
+            return std::set<std::string>();
         }
 
         std::set<std::string> supports()
diff --git a/src/strategy/values/RtiTargetValue.h b/src/strategy/values/RtiTargetValue.h
index 6d22c63c..5fd26112 100644
--- a/src/strategy/values/RtiTargetValue.h
+++ b/src/strategy/values/RtiTargetValue.h
@@ -13,7 +13,7 @@ class Unit;
 class RtiTargetValue : public TargetValue
 {
     public:
-        RtiTargetValue(PlayerbotAI* botAI, std::string const type = "rti", std::string const name = "rti target") : type(type), TargetValue(botAI, name) { }
+        RtiTargetValue(PlayerbotAI* botAI, std::string const type = "rti", std::string const name = "rti target") : TargetValue(botAI, name), type(type) { }
 
         static int32 GetRtiIndex(std::string const rti);
         Unit* Calculate() override;