cellFsStat fix and other fixes