More Amazon AMI compatibility changes