[#62061252] Update build + fix few things.