Minor fixes in inchlib_clust
Merge conflicts