Minor fixes to default AMI_ID setting.