Issue #20715: More bug fixes