Updates based on EWG review.