Various fixes to combat