Failover fixes. Now working fairly well.