[#48656383] Some more fixes.