Final fixes of File component. Everything is good