issue #19550: More fixes