Tweaks to diff