Fixes to Coverity cases 72678 (retry), 72693