Fix a test error.
Fix a comment
Merge pull request #486 from nomis52/master

Fix a build failure and a comment.