Sort out diffs