Fix broken connections