amtl fixes