Issue #205: more fixes to content providers