Modify Some Bugs