IGMP improvements