Latest cdiff tweaks