[#58728646] add some fixes