Resolve "fix 3 minors issues"

Merged Sebastien Masson requested to merge 36-fix-3-minors-issues into branch_4.2

Closes #36 (closed)

Merge request reports