Minor fixes

Merged Astor Bizard requested to merge dev into test

Merge request reports