Additions to IP stuff