Fixes to Coverity issues 72736 & 72735