latest fixes for basic cluster