[aml] temp fixes, from frodo 12.1 backports, replace when we merge with 12.1