Various tweaks to attacks