More fixes to net handling