This contains the final set of fixes for the various failover cases we
encountered when testing with DT.