Repair Bridges

In preparation.