Fix warnings in clustering