Various minor fixes [fix #136]
Fix typo
Merge pull request #137 from breach/fixes

Review: Various minor fixes [fix #136]