Attack fixes