Minor fixes

Chris Hinesrequested to merge
minor_fixes into master

Merge request reports