Assorted fixes

Merged Darryl Green requested to merge github/fork/n-royer/fix into master

Created by: n-royer

Merge request reports