Fixes for #224

For some reason it thinks every line in the files are changed. I have no idea what's wrong.