Minor changes from last review.