few simple changes for cluster