A few minor fixes
Merge pull request #46 from crwper/minor_fixes

A few minor fixes