issue #20530: Some additional fixes.