Fix another typo
Fix combat detection