Fixes

Merged Finbar Ó Deaghaidh requested to merge fixes into master

Merge request reports