Fix a couple of mistakes
Merge pull request #683 from rlerdorf/master

Fix a few minor mistakes