combat fixes