1.BugFix Modify some bugs