Minor fixes
Merge pull request #23 from fgrollier/master

Some more small fixes