Change some bugs