[#62061252] more fixes.