A few MAM fixes