Fix order of address fields.