More fixes on the failover front.