Pull in fixes by Elias
fixes to the diffff.xml