More IPAddressSupport Fixes