Fix some bugs
fix some bugs