Fixes for clustering