issue #20503: Some additional fixes.