Combat fixes