Minor fixes

Michaël Roynardrequested to merge
dev into master

Merge request reports