Fixed ProviderFacilitiesMarshaler and ProviderOrganizationsMarshaler