diff --git a/libs/l_net/l_net.c b/libs/l_net/l_net.c
index 924e123e..1bcb2456 100644
--- a/libs/l_net/l_net.c
+++ b/libs/l_net/l_net.c
@@ -36,9 +36,6 @@
 #include "l_net.h"
 #include "l_net_wins.h"
 
-#define GetMemory malloc
-#define FreeMemory free
-
 #ifdef _DEBUG
 void WinPrint( const char *str, ... ){
 	va_list argptr;
@@ -48,7 +45,7 @@ void WinPrint( const char *str, ... ){
 	vsprintf( text, str, argptr );
 	va_end( argptr );
 
-	printf( text );
+	printf( "%s", text );
 }
 #else
 void WinPrint( const char *str, ... ){
@@ -178,11 +175,7 @@ int Net_Receive( socket_t *sock, netmessage_t *msg ){
 // Changes Globals:		-
 //===========================================================================
 socket_t *Net_AllocSocket( void ){
-	socket_t *sock;
-
-	sock = (socket_t *) GetMemory( sizeof( socket_t ) );
-	memset( sock, 0, sizeof( socket_t ) );
-	return sock;
+	return calloc( 1, sizeof( socket_t ) );
 } //end of the function Net_AllocSocket
 //===========================================================================
 //
@@ -191,7 +184,7 @@ socket_t *Net_AllocSocket( void ){
 // Changes Globals:		-
 //===========================================================================
 void Net_FreeSocket( socket_t *sock ){
-	FreeMemory( sock );
+	free( sock );
 } //end of the function Net_FreeSocket
 //===========================================================================
 //
diff --git a/libs/l_net/l_net_berkley.c b/libs/l_net/l_net_berkley.c
index 49b5a01a..c48b492a 100644
--- a/libs/l_net/l_net_berkley.c
+++ b/libs/l_net/l_net_berkley.c
@@ -566,46 +566,27 @@ int WINS_Broadcast( int socket, byte *buf, int len ){
 // Changes Globals:		-
 //===========================================================================
 bool WINS_Write( int socket, byte *buf, int len, struct sockaddr_s *addr ){
-	int ret, written;
-	ret = 0;
+	int ret = 0, written = 0;
 
-	if ( addr ) {
-		written = 0;
-		while ( written < len )
-		{
-			ret = sendto( socket, &buf[written], len - written, 0, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
-			if ( ret == SOCKET_ERROR ) {
-				if ( WSAGetLastError() != EAGAIN ) {
-					return false;
-				}
-				//++timo FIXME: what is this used for?
-//				Sleep(1000);
-			} //end if
-			else
-			{
-				written += ret;
-			}
-		}
-	} //end if
-	else
+	while ( written < len )
 	{
-		written = 0;
-		while ( written < len )
-		{
+		if ( addr )
+			ret = sendto( socket, &buf[written], len - written, 0, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
+		else
 			ret = send( socket, buf, len, 0 );
-			if ( ret == SOCKET_ERROR ) {
-				if ( WSAGetLastError() != EAGAIN ) {
-					return false;
-				}
-				//++timo FIXME: what is this used for?
-//				Sleep(1000);
-			} //end if
-			else
-			{
-				written += ret;
+
+		if ( ret == SOCKET_ERROR ) {
+			if ( WSAGetLastError() != EAGAIN ) {
+				return false;
 			}
+			//++timo FIXME: what is this used for?
+//			Sleep(1000);
 		}
-	} //end else
+		else
+		{
+			written += ret;
+		}
+	}
 	if ( ret == SOCKET_ERROR ) {
 		WinPrint( "WINS_Write: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
 	} //end if
diff --git a/libs/l_net/l_net_wins.c b/libs/l_net/l_net_wins.c
index ddad1783..c62d40f6 100644
--- a/libs/l_net/l_net_wins.c
+++ b/libs/l_net/l_net_wins.c
@@ -506,14 +506,14 @@ int WINS_CheckNewConnections( void ){
 //===========================================================================
 int WINS_Read( int socket, byte *buf, int len, struct sockaddr_s *addr ){
 	int addrlen = sizeof( struct sockaddr_s );
-	int ret, errno;
+	int ret, error;
 
 	if ( addr ) {
 		ret = recvfrom( socket, buf, len, 0, (struct sockaddr *)addr, &addrlen );
 		if ( ret == -1 ) {
-			errno = WSAGetLastError();
+			error = WSAGetLastError();
 
-			if ( errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED ) {
+			if ( error == WSAEWOULDBLOCK || error == WSAECONNREFUSED ) {
 				return 0;
 			}
 		} //end if
@@ -522,9 +522,9 @@ int WINS_Read( int socket, byte *buf, int len, struct sockaddr_s *addr ){
 	{
 		ret = recv( socket, buf, len, 0 );
 		if ( ret == SOCKET_ERROR ) {
-			errno = WSAGetLastError();
+			error = WSAGetLastError();
 
-			if ( errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED ) {
+			if ( error == WSAEWOULDBLOCK || error == WSAECONNREFUSED ) {
 				return 0;
 			}
 		} //end if
@@ -581,43 +581,26 @@ int WINS_Broadcast( int socket, byte *buf, int len ){
 // Changes Globals:		-
 //===========================================================================
 bool WINS_Write( int socket, byte *buf, int len, struct sockaddr_s *addr ){
-	int ret, written;
+	int ret = 0, written = 0;
 
-	if ( addr ) {
-		written = 0;
-		while ( written < len )
-		{
-			ret = sendto( socket, &buf[written], len - written, 0, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
-			if ( ret == SOCKET_ERROR ) {
-				if ( WSAGetLastError() != WSAEWOULDBLOCK ) {
-					return false;
-				}
-				Sleep( 1000 );
-			} //end if
-			else
-			{
-				written += ret;
-			}
-		}
-	} //end if
-	else
+	while ( written < len )
 	{
-		written = 0;
-		while ( written < len )
-		{
+		if ( addr )
+			ret = sendto( socket, &buf[written], len - written, 0, (struct sockaddr *)addr, sizeof( struct sockaddr_s ) );
+		else
 			ret = send( socket, buf, len, 0 );
-			if ( ret == SOCKET_ERROR ) {
-				if ( WSAGetLastError() != WSAEWOULDBLOCK ) {
-					return false;
-				}
-				Sleep( 1000 );
-			} //end if
-			else
-			{
-				written += ret;
+
+		if ( ret == SOCKET_ERROR ) {
+			if ( WSAGetLastError() != WSAEWOULDBLOCK ) {
+				return false;
 			}
+			Sleep( 1000 );
+		} //end if
+		else
+		{
+			written += ret;
 		}
-	} //end else
+	}
 	if ( ret == SOCKET_ERROR ) {
 		WinPrint( "WINS_Write: %s\n", WINS_ErrorMessage( WSAGetLastError() ) );
 	} //end if