some fixes for #18943