Fixed up Combat for b252.