Correct some issues.