[clust] some more fixes