More Content Provider tweaks