Improved Amazon EC2 support