Minor fixes.
Merge pull request #56 from johnb30/minor

Minor fixes.