Various fixes for new RPC mcast stuff