Small changes following the last round of comments.