Changes due to comments.