Bug fixes for attack to switch back to chase/finishchase