More fixes to net stuff