Fixing cluster utils