Fix support for AWS EC2