minor tidy ups

Merged bgm requested to merge github/fork/eileenmcnaughton/master into master

Created by: eileenmcnaughton

Merge request reports