Fix cell lists