Multicast and l2 label fixes