Cluster plot bugfixes