Fix of DG and surface forms.