Fixes to file content provider