fixes for cluster