bring in more from eth_bridge, fix compile issues