Fixing cluster race condition issues.