Minor changes to handle non-specified availability zones.