issue #20212: Misc fixes.