File fixes