Various fixes, combat test.