EMF Compare tweaks