Fixes

Merged Chris Hines requested to merge fixes into master

Merge request reports