Last fixes to get ed diffs working