Fix bridges build
More cleanup and misc fixing