Addressing some PR comments.