Patches noipv6

A few final non-ipv6 patches

After these I will concentrate of redoing IPv6 per your suggestions.