Two minor fixes.
Merge pull request #252 from programsam/master

Two minor fixes.