More fixes after attack notification patch review