Correct some minor problem