Merge "Fix warnings in clustering"