Fix up providers from internal changes