Correct some import and packages