Fixing cluster changes, reloading tokens when none are found. Fixes #36