Additional changes from group review.