issue #22155: More fixes.