Fixed PR comments.