More fixes + datagram network testing