Fixes for > 2 RtcommEndpoints on 1 endpointProvider