Minor updates from PR comments.