[3.8.4] Fix some issues