Fix some bugs->yuanzhe