Changes requested from review.