FixSomeBugs