More fixes to Attacks and Collisions