Further payload provider tweaks.