Fix bridging calls with the Broker.