Minor bugfixes for attack