Correct some minor bug