Correct some bad issues