Some little changes from pull request comments.