Modify some bugs