CLOUD-160 new amis, fixed minor things