Minor fixes

Merged Agate requested to merge minor-fixes into develop

Merge request reports