*) Fix cluster bugs.