Fix clustering issues