Correct some mistakes I haven't tested