battle fixes