Bug fixes for passivating.
Small refactor to cluster sharding.