Correct some problems