Mike/minor fixes

Mike Hoang requested to merge mike/minor-fixes into master

Merge request reports