Fixes required for multicast