diff --git a/lib/BattleState.cpp b/lib/BattleState.cpp
index 5f227569f..2fac2267a 100644
--- a/lib/BattleState.cpp
+++ b/lib/BattleState.cpp
@@ -3063,8 +3063,8 @@ const CGHeroInstance * CStack::getMyHero() const
 		return dynamic_cast<const CGHeroInstance *>(base->armyObj);
 	else //we are attached directly?
 		BOOST_FOREACH(const CBonusSystemNode *n, getParentNodes())
-		if(n->getNodeType() == HERO)
-			dynamic_cast<const CGHeroInstance *>(n);//FIXME: unused result. Missing return?
+			if(n->getNodeType() == HERO)
+				return dynamic_cast<const CGHeroInstance *>(n);
 
 	return NULL;
 }
diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp
index f17802fb8..ef3cd5795 100644
--- a/server/CGameHandler.cpp
+++ b/server/CGameHandler.cpp
@@ -1517,7 +1517,6 @@ void CGameHandler::run(bool resume)
 		for(; i != gs->players.end(); i++)
 		{
 			if((i->second.towns.size()==0 && i->second.heroes.size()==0)
-				//|| i->second.color<0  //FIXME: color is unsigned. Redundant or incorrect check?
 				|| i->first>=GameConstants::PLAYER_LIMIT  
 				|| i->second.status) 
 			{