Fixes to Coveriry issues 72757 & 73266