Better handle cloudformations that span AZ's