Minor Fixes

Closed Paul Cammish requested to merge 190624_fixes into stretch-testing

Merge request reports