Provider tweaks and address