Add changes from review.