issue #19314: Misc. fixes