Updated EC2 stuff from launchpad.net