Fix some bugs before jilin