Bugfixes to combat code