Fix some stuff, no longer use old bridge method