Made additional enhancements to EC2 support.