Multicast fixes