Correct some parts before release