Index: uspace/app/nettest1/nettest1.c
===================================================================
--- uspace/app/nettest1/nettest1.c	(revision 9ce7eb5598d8406b446c6b10521809d27125548b)
+++ uspace/app/nettest1/nettest1.c	(revision c9ebbe71bdbefce078df0f042b163a633dc6753e)
@@ -287,9 +287,6 @@
 int main(int argc, char *argv[])
 {
-
-	socklen_t max_length;
-	uint8_t *address_data[sizeof(struct sockaddr_in6)];
-	struct sockaddr_in *address_in;
-	struct sockaddr_in6 *address_in6;
+	struct sockaddr_in address_in;
+	struct sockaddr_in6 address_in6;
 	uint8_t *address_start;
 
@@ -300,9 +297,4 @@
 
 	int rc;
-
-	max_length = sizeof(address_data);
-	address = (struct sockaddr *) address_data;
-	address_in = (struct sockaddr_in *) address;
-	address_in6 = (struct sockaddr_in6 *) address;
 
 	sockets = 10;
@@ -334,18 +326,19 @@
 
 	/* Prepare the address buffer */
-	bzero(address_data, max_length);
 
 	switch (family) {
 	case PF_INET:
-		address_in->sin_family = AF_INET;
-		address_in->sin_port = htons(port);
-		address_start = (uint8_t *) &address_in->sin_addr.s_addr;
-		addrlen = sizeof(struct sockaddr_in);
+		address_in.sin_family = AF_INET;
+		address_in.sin_port = htons(port);
+		address = (struct sockaddr *) &address_in;
+		addrlen = sizeof(address_in);
+		address_start = (uint8_t *) &address_in.sin_addr.s_addr;
 		break;
 	case PF_INET6:
-		address_in6->sin6_family = AF_INET6;
-		address_in6->sin6_port = htons(port);
-		address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr;
-		addrlen = sizeof(struct sockaddr_in6);
+		address_in6.sin6_family = AF_INET6;
+		address_in6.sin6_port = htons(port);
+		address = (struct sockaddr *) &address_in6;
+		addrlen = sizeof(address_in6);
+		address_start = (uint8_t *) &address_in6.sin6_addr.s6_addr;
 		break;
 	default:
Index: uspace/app/nettest2/nettest2.c
===================================================================
--- uspace/app/nettest2/nettest2.c	(revision 9ce7eb5598d8406b446c6b10521809d27125548b)
+++ uspace/app/nettest2/nettest2.c	(revision c9ebbe71bdbefce078df0f042b163a633dc6753e)
@@ -223,9 +223,7 @@
 int main(int argc, char *argv[])
 {
-	socklen_t max_length;
-	uint8_t address_data[sizeof(struct sockaddr_in6)];
 	struct sockaddr *address;
-	struct sockaddr_in *address_in;
-	struct sockaddr_in6 *address_in6;
+	struct sockaddr_in address_in;
+	struct sockaddr_in6 address_in6;
 	socklen_t addrlen;
 	uint8_t *address_start;
@@ -247,9 +245,4 @@
 	port = 7;
 
-	max_length = sizeof(address_data);
-	address = (struct sockaddr *) address_data;
-	address_in = (struct sockaddr_in *) address;
-	address_in6 = (struct sockaddr_in6 *) address;
-
 	/*
 	 * Parse the command line arguments.
@@ -279,18 +272,19 @@
 
 	/* Prepare the address buffer */
-	bzero(address_data, max_length);
 
 	switch (family) {
 	case PF_INET:
-		address_in->sin_family = AF_INET;
-		address_in->sin_port = htons(port);
-		address_start = (uint8_t *) &address_in->sin_addr.s_addr;
-		addrlen = sizeof(struct sockaddr_in);
+		address_in.sin_family = AF_INET;
+		address_in.sin_port = htons(port);
+		address = (struct sockaddr *) &address_in;
+		addrlen = sizeof(address_in);
+		address_start = (uint8_t *) &address_in.sin_addr.s_addr;
 		break;
 	case PF_INET6:
-		address_in6->sin6_family = AF_INET6;
-		address_in6->sin6_port = htons(port);
-		address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr;
-		addrlen = sizeof(struct sockaddr_in6);
+		address_in6.sin6_family = AF_INET6;
+		address_in6.sin6_port = htons(port);
+		address = (struct sockaddr *) &address_in6;
+		addrlen = sizeof(address_in6);
+		address_start = (uint8_t *) &address_in6.sin6_addr.s6_addr;
 		break;
 	default: