Minor fixes

Shaun Warrington requested to merge minor_fixes into master

Merge request reports