Misc fixes for icmp and wmi