Small changes from review.