Fix runtime errors caused by disambiguation changes earlier. Also fix dos endings on the two files
I touched earlier. I am betting this is a git thing.