diff --git a/client/widgets/CExchangeController.cpp b/client/widgets/CExchangeController.cpp
index 10888ea5b..23c9019d8 100644
--- a/client/widgets/CExchangeController.cpp
+++ b/client/widgets/CExchangeController.cpp
@@ -7,7 +7,7 @@
  * Full text of license available in license.txt file, in main folder
  *
  */
-
+#include "StdInc.h"
 #include "CExchangeController.h"
 
 #include "../CPlayerInterface.h"
diff --git a/client/windows/GUIClasses.cpp b/client/windows/GUIClasses.cpp
index 76a9d8a2c..419dea97f 100644
--- a/client/windows/GUIClasses.cpp
+++ b/client/windows/GUIClasses.cpp
@@ -755,7 +755,7 @@ CExchangeWindow::CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2,
 
 	if(qeLayout)
 	{
-		auto moveArtifacts = [this](const std::function<void(bool, bool)> moveRoutine) -> void
+		auto moveArtifacts = [](const std::function<void(bool, bool)> moveRoutine) -> void
 		{
 			bool moveEquipped = true;
 			bool moveBackpack = true;
diff --git a/lib/CArtifactInstance.cpp b/lib/CArtifactInstance.cpp
index 13ca20d64..8c178eda0 100644
--- a/lib/CArtifactInstance.cpp
+++ b/lib/CArtifactInstance.cpp
@@ -52,7 +52,7 @@ const std::vector<CCombinedArtifactInstance::PartInfo> & CCombinedArtifactInstan
 void CCombinedArtifactInstance::addPlacementMap(CArtifactSet::ArtPlacementMap & placementMap)
 {
 	if(!placementMap.empty())
-		for(auto& part : partsInfo)
+		for(auto & part : partsInfo)
 		{
 			assert(placementMap.find(part.art) != placementMap.end());
 			part.slot = placementMap.at(part.art);
@@ -167,7 +167,8 @@ bool CArtifactInstance::isCombined() const
 
 void CArtifactInstance::putAt(const ArtifactLocation & al)
 {
-	addPlacementMap(al.getHolderArtSet()->putArtifact(al.slot, this));
+	auto placementMap = al.getHolderArtSet()->putArtifact(al.slot, this);
+	addPlacementMap(placementMap);
 }
 
 void CArtifactInstance::removeFrom(const ArtifactLocation & al)