file loader fixes