Some minor changes to file library