Files has some broken-ness

@Jerel