More IP Fixes