Diff fixes