changes to support Amazon EC2 instances