Fixes on commander and soldier.