[Minor] Work on ICMP and IP