Small fixes to attack