Provider tweaks