Handle issue with m3.xlarge instances
Fix hvm naming issue