[Fix] Fix some bugs