More failover updates.
Work on getting both Topics and Queues working.