issue #19379: two tweaks