Very important combat fixes!