Issue #21628: More bug fixes