Minor fixes
Merge pull request #13 from akeneo/fix/minor-1

Minor fixes