Fix little bugs with attack battle features