Modified some bugs