Changes to address PR comments.