[EC2] Minor fixes and pre-release improvements

A batch of small fixes and requested minor features. Still WIP.