Fix Cell Lists