issue #21664: Some fixes.