Small fixes

Merged Daniele Venzano requested to merge devel/master into master

Merge request reports