Small fixes to battle logic.