Various minor improvements

Merged Sylvain Berfini requested to merge fix/various into master

Merge request reports