Miscellaneous minor changes and fixes

Merged Darryl Green requested to merge github/fork/CJKay/misc-fixes into master

Created by: CJKay

Merge request reports