RemoteBridge: CS fixes