Fixing EC2 discovery