Minor fixes
Merge pull request #1 from montaro/master

Minor fixes