Tiny fixes
Merge pull request #3 from mizzy/tiny-fixes

Tiny fixes