Patches to fix IPv6 variable check.