some fixes to cluster data