Some more fixes for contentprovider