diff --git a/AI/BattleAI/BattleAI.cpp b/AI/BattleAI/BattleAI.cpp
index 25cba4e5f..aa8e1255d 100644
--- a/AI/BattleAI/BattleAI.cpp
+++ b/AI/BattleAI/BattleAI.cpp
@@ -346,6 +346,7 @@ struct PotentialTargets
 
 BattleAction CBattleAI::activeStack( const CStack * stack )
 {
+	cbc = cb; //TODO: make solid sure that AIs always use their callbacks (need to take care of event handlers too)
 	try
 	{
 		print("activeStack called for " + stack->nodeName());
diff --git a/lib/CObjectHandler.cpp b/lib/CObjectHandler.cpp
index 9bc22f92e..dad9877a7 100644
--- a/lib/CObjectHandler.cpp
+++ b/lib/CObjectHandler.cpp
@@ -1639,7 +1639,7 @@ void CGDwelling::initObj()
 	}
 }
 
-void CGDwelling::setPropertyDer(ui8 what, ui32 val)
+void CGDwelling::setProperty(ui8 what, ui32 val)
 {
 	switch (what)
 	{
diff --git a/lib/CObjectHandler.h b/lib/CObjectHandler.h
index d02ac4907..f723bf7a6 100644
--- a/lib/CObjectHandler.h
+++ b/lib/CObjectHandler.h
@@ -478,7 +478,7 @@ public:
 	void onHeroVisit(const CGHeroInstance * h) const override;
 	void newTurn() const override;
 protected:
-	void setPropertyDer(ui8 what, ui32 val) override;
+	void setProperty(ui8 what, ui32 val) override;
 private:
 	void heroAcceptsCreatures(const CGHeroInstance *h, ui32 answer) const;
 	void fightOver(const CGHeroInstance *h, BattleResult *result) const;