Fixed some bridge connection logic