minor fixes
Merge pull request #250 from arnaudbey/fixes

minor fixes