Bug fixes for fighting