tweaks to make cluster work