Fixes for content provider implementation