Multiple fixes

Merged Chris Hines requested to merge multiple_fixes into master

Merge request reports