fix issues pointed in #23214