Little code fixes to match file_loader