[BattleActivity] Little fixes.