Final fixes after attack notification patch review