Correct some stuffs