Index: uspace/srv/hid/remcons/remcons.c
===================================================================
--- uspace/srv/hid/remcons/remcons.c	(revision b99f6e2bfcdcd33a1aa7616e8bf217218ee9059b)
+++ uspace/srv/hid/remcons/remcons.c	(revision d6ff08a03b1e69b9d61b8f2730923f613c7cbb0b)
@@ -282,11 +282,20 @@
 }
 
-/** Fibril for each accepted socket.
- *
- * @param arg Corresponding @c telnet_user_t structure.
- */
-static int network_user_fibril(void *arg)
-{
-	telnet_user_t *user = arg;
+/** Handle network connection.
+ *
+ * @param lst  Listener
+ * @param conn Connection
+ */
+static void remcons_new_conn(tcp_listener_t *lst, tcp_conn_t *conn)
+{
+	telnet_user_t *user = telnet_user_create(conn);
+	assert(user);
+
+	con_srvs_init(&user->srvs);
+	user->srvs.ops = &con_ops;
+	user->srvs.sarg = user;
+	user->srvs.abort_timeout = 1000;
+
+	telnet_user_add(user);
 
 	int rc = loc_service_register(user->service_name, &user->service_id);
@@ -294,14 +303,14 @@
 		telnet_user_error(user, "Unable to register %s with loc: %s.",
 		    user->service_name, str_error(rc));
-		return EOK;
+		return;
 	}
 
 	telnet_user_log(user, "Service %s registerd with id %" PRIun ".",
 	    user->service_name, user->service_id);
-	
+
 	fid_t spawn_fibril = fibril_create(spawn_task_fibril, user);
 	assert(spawn_fibril);
 	fibril_add_ready(spawn_fibril);
-	
+
 	/* Wait for all clients to exit. */
 	fibril_mutex_lock(&user->guard);
@@ -321,5 +330,5 @@
 	}
 	fibril_mutex_unlock(&user->guard);
-	
+
 	rc = loc_service_unregister(user->service_id);
 	if (rc != EOK) {
@@ -331,23 +340,4 @@
 	telnet_user_log(user, "Destroying...");
 	telnet_user_destroy(user);
-
-	return EOK;
-}
-
-static void remcons_new_conn(tcp_listener_t *lst, tcp_conn_t *conn)
-{
-	telnet_user_t *user = telnet_user_create(conn);
-	assert(user);
-
-	con_srvs_init(&user->srvs);
-	user->srvs.ops = &con_ops;
-	user->srvs.sarg = user;
-	user->srvs.abort_timeout = 1000;
-
-	telnet_user_add(user);
-
-	fid_t fid = fibril_create(network_user_fibril, user);
-	assert(fid);
-	fibril_add_ready(fid);
 }
 
@@ -367,11 +357,11 @@
 
 	rc = tcp_create(&tcp);
-	if (tcp != EOK) {
-		fprintf(stderr, "%s: Error initialzing TCP.\n", NAME);
+	if (rc != EOK) {
+		fprintf(stderr, "%s: Error initializing TCP.\n", NAME);
 		return rc;
 	}
 
 	inet_ep_init(&ep);
-	ep.port = 2223;
+	ep.port = 8080;
 
 	rc = tcp_listener_create(tcp, &ep, &listen_cb, NULL, &conn_cb, NULL,
Index: uspace/srv/hid/rfb/rfb.c
===================================================================
--- uspace/srv/hid/rfb/rfb.c	(revision b99f6e2bfcdcd33a1aa7616e8bf217218ee9059b)
+++ uspace/srv/hid/rfb/rfb.c	(revision d6ff08a03b1e69b9d61b8f2730923f613c7cbb0b)
@@ -757,4 +757,10 @@
 	int rc;
 	
+	rc = tcp_create(&tcp);
+	if (rc != EOK) {
+		log_msg(LOG_DEFAULT, LVL_ERROR, "Error initializing TCP.");
+		goto error;
+	}
+	
 	inet_ep_init(&ep);
 	ep.port = port;
@@ -763,5 +769,5 @@
 	    &lst);
 	if (rc != EOK) {
-		log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating listener.\n");
+		log_msg(LOG_DEFAULT, LVL_ERROR, "Error creating listener.");
 		goto error;
 	}