Fix up handling of files