Bug fixes, better bridges