fix minor stuff
Merge pull request #609 from arnaudbey/fix-minor-stuff

fix minor stuff