fixes to ediff