Tweaks

Merged Chris Hines requested to merge tweaks into master

Merge request reports