Content Providers - fixes