Miscellaneous fixes and adjustments

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

Created by: CJKay

This PR fixes some minor style issues as well as a couple of small bugs.

Merge request reports