Fixes for multicast