AttackWander style fixes