Fixes for bridge setup