Couple battle fixes