[#85117404] some fixes