Fixes in GAMM.