diff --git a/src/node.c b/src/node.c
index 774275eec..89e0602e0 100644
--- a/src/node.c
+++ b/src/node.c
@@ -46,14 +46,14 @@ struct node* node_create(const char *name, enum node_type type, const char *loca
 		return NULL;
 	}
 
-	ret = bind(n->sd, &n->local, sizeof(struct sockaddr_in));
+	ret = bind(n->sd, (struct sockaddr *) &n->local, sizeof(struct sockaddr_in));
 	if (ret < 0) {
 		node_destroy(n);
 		print(FATAL, "Failed to bind socket: %s", strerror(errno));
 		return NULL;
 	}
 
-	ret = connect(n->sd, &n->remote, sizeof(struct sockaddr_in));
+	ret = connect(n->sd, (struct sockaddr *) &n->remote, sizeof(struct sockaddr_in));
 	if (ret < 0) {
 		node_destroy(n);
 		print(FATAL, "Failed to connect socket: %s", strerror(errno));
diff --git a/src/test.c b/src/test.c
index 2556a62eb..5f1f7e556 100644
--- a/src/test.c
+++ b/src/test.c
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 		.sin_family = AF_INET,
 		.sin_port = htons(atoi(argv[3]))
 	};
-	inet_aton(argv[2], &sa.sin_addr);
+	inet_pton(AF_INET, argv[2], &sa.sin_addr);
 
 	sigset_t mask;
 	sigemptyset(&mask);
@@ -73,9 +73,9 @@ int main(int argc, char *argv[])
 	//sigprocmask(SIG_SETMASK, &mask, NULL);
 	sigprocmask(SIG_UNBLOCK, &mask, NULL);
 
-	ret = bind(sd, &sa, sizeof(struct sockaddr_in));
+	ret = bind(sd, (struct sockaddr *) &sa, sizeof(struct sockaddr_in));
 
-	ret = connect(sd, &sa, sizeof(struct sockaddr_in));
+	ret = connect(sd, (struct sockaddr *) &sa, sizeof(struct sockaddr_in));
 	if (ret < 0)
 		print(FATAL, "Failed to connect socket: %s", strerror(errno));