[Fix] - Fix some bugs