Enhancements to EC2 functionality

Mostly minor additions extracted from work we've done in our playbooks.