More fixes to auto-fight