Address more comments.