Fix incorrectly named parameter in EC2 configuration
Re-order argument in S3 model