Combat fixed up a bit