Fixed some pull request comments.