ICMP related fixes