fixes for Attack command