diff --git a/AI/BattleAI/BattleAI.cpp b/AI/BattleAI/BattleAI.cpp
index b94a56513..73a133467 100644
--- a/AI/BattleAI/BattleAI.cpp
+++ b/AI/BattleAI/BattleAI.cpp
@@ -52,8 +52,7 @@ void CBattleAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::share
 	setCbc(CB);
 	env = ENV;
 	cb = CB;
-	assert(0);// FIXME:
-	// playerID = *CB->getPlayerID(); //TODO should be sth in callback
+	playerID = *CB->getPlayerID();
 	wasWaitingForRealize = CB->waitTillRealize;
 	wasUnlockingGs = CB->unlockGsWhenWaiting;
 	CB->waitTillRealize = false;
diff --git a/CCallback.h b/CCallback.h
index 8acb0d6c5..3657e3581 100644
--- a/CCallback.h
+++ b/CCallback.h
@@ -145,9 +145,9 @@ public:
 	virtual ~CCallback();
 
 	//client-specific functionalities (pathfinding)
-	bool canMoveBetween(const int3 &a, const int3 &b);
-	int3 getGuardingCreaturePosition(int3 tile);
-	std::shared_ptr<const CPathsInfo> getPathsInfo(const CGHeroInstance * h);
+	virtual bool canMoveBetween(const int3 &a, const int3 &b);
+	virtual int3 getGuardingCreaturePosition(int3 tile);
+	virtual std::shared_ptr<const CPathsInfo> getPathsInfo(const CGHeroInstance * h);
 
 	std::optional<PlayerColor> getPlayerID() const override;
 
diff --git a/lib/battle/IBattleInfoCallback.h b/lib/battle/IBattleInfoCallback.h
index d216bf454..5996d5bda 100644
--- a/lib/battle/IBattleInfoCallback.h
+++ b/lib/battle/IBattleInfoCallback.h
@@ -56,6 +56,7 @@ public:
 #if SCRIPTING_ENABLED
 	virtual scripting::Pool * getContextPool() const = 0;
 #endif
+	virtual ~IBattleInfoCallback() = default;
 
 	virtual const IBattleInfo * getBattle() const = 0;
 	virtual std::optional<PlayerColor> getPlayerID() const = 0;