Minor fixes on clustering