[3.8.5] Fix some bugs