Improve failover.