[#49067409] Fix some bugs