More updates from EWG feedback.