Updates to handling of file io/metadata.