issue #19131: Misc. fixes.