Fixed some changes, which didn't work with certain versions of diff