Rollup of minor fixes found by Martin Ettl
Merge pull request #58 from ethanhugg/othercontribs

Rollup of minor fixes found by Martin Ettl