Fixes in DG, work on GAMM.