Fixed recently introduced errors/warnings in CellStoreV6