Fixes for battle