Improvements to saving and cellFsStat