Some more fixes for #23366