More IP related fixes