Amsll fixes