More attacks fixed