[Fix] Some bugs