Fixed Instance Types and Ec2 issues