Minor mods

Merged Bock, Andy requested to merge Bock into main

Minor mods on back-end of last big MR

Merge request reports