Changes to file saving utilities