[3.8.6] Fix some bugs