Fix SecAnnotator issues (NH-3339)