Diff tweaks