Fixes to Cell and Cluster