diff --git a/Src/C64_SDL.h b/Src/C64_SDL.h
index 8df81b2..21ce14d 100644
--- a/Src/C64_SDL.h
+++ b/Src/C64_SDL.h
@@ -63,16 +63,10 @@ void C64::c64_ctor1(void)
 	this->peer = NULL;
 
 	if (fixme_tmp_network_server) {
+		printf("Connecting to %s\n", fixme_tmp_network_server);
 		strcpy(this->server_hostname, fixme_tmp_network_server);
 		this->peer = new Network(this->server_hostname, this->server_port);
-		this->network_connection_type = MASTER;
-		printf("Waiting for connection\n");
-		if (this->peer->Connect() == false)
-		{
-			printf("No client connected. Bye\n");
-			delete this->peer;
-			this->peer = NULL;
-		}
+		this->network_connection_type = CONNECT;
 	}
 }
 
diff --git a/Src/main_x.h b/Src/main_x.h
index 6729441..e5b0b0d 100644
--- a/Src/main_x.h
+++ b/Src/main_x.h
@@ -107,10 +107,9 @@ char *fixme_tmp_network_server = 0;
 
 void Frodo::ArgvReceived(int argc, char **argv)
 {
+	printf("Argc: %d\n", argc);
 	if (argc == 2)
-	{
 		fixme_tmp_network_server = argv[1];
-	}
 }