diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index da2f410004..c9545c871c 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -3129,33 +3129,19 @@ static int action_ok_netplay_connect_room(const char *path,
       command_event(CMD_EVENT_NETPLAY_DEINIT, NULL);
    netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL);
 
-   /* For testing purposes
-   strlcpy(tmp_hostname, "192.168.1.241", sizeof(tmp_hostname));*/
-   strlcpy(tmp_hostname,
-         netplay_room_list[idx - 1].address,
-         sizeof(tmp_hostname));
    snprintf(tmp_hostname,
          sizeof(tmp_hostname),
          "%s:%d", 
       netplay_room_list[idx - 1].address,
       netplay_room_list[idx - 1].port);
 
-   RARCH_LOG("%s %s %08x", netplay_room_list[idx - 1].address,
+   RARCH_LOG("Connecting to: %s with game: %s/%08x", 
+         netplay_room_list[idx - 1].address,
          netplay_room_list[idx - 1].gamename,
          netplay_room_list[idx - 1].gamecrc);
 
-   /* If we haven't yet started, this will load on its own */
-   if (!content_is_inited())
-   {
-      task_push_netplay_crc_scan(netplay_room_list[idx - 1].gamecrc,
-            tmp_hostname, netplay_room_list[idx - 1].corename);
-   }
-   else
-   {
-      /* Enable Netplay itself */
-      if (!command_event(CMD_EVENT_NETPLAY_INIT, (void *) tmp_hostname))
-         return -1;
-   }
+   task_push_netplay_crc_scan(netplay_room_list[idx - 1].gamecrc,
+      tmp_hostname, netplay_room_list[idx - 1].corename);
 
 #else
    return -1;
@@ -3403,6 +3389,8 @@ finish:
             netplay_room_list[i].gamecrc   = atoi(room_data->elems[j + 6].data);
             netplay_room_list[i].timestamp = atoi(room_data->elems[j + 7].data);
 
+/* Uncomment this to debug mismatched room parameters*/
+#if 0
             RARCH_LOG("Room Data: %d\n"
                "Nickname:         %s\n"
                "Address:          %s\n"
@@ -3420,7 +3408,7 @@ finish:
                netplay_room_list[i].gamename,
                netplay_room_list[i].gamecrc,
                netplay_room_list[i].timestamp);
-
+#endif
             j+=8;
 
             snprintf(s, sizeof(s), "Nickname: %s",
diff --git a/tasks/task_netplay_crc.c b/tasks/task_netplay_crc.c
index a497b90d58..e2b972ad3e 100644
--- a/tasks/task_netplay_crc.c
+++ b/tasks/task_netplay_crc.c
@@ -80,13 +80,13 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
    netplay_crc_handle_t *state = (netplay_crc_handle_t*)task->state;
 
    task_set_progress(task, 0);
-   task_set_title(task, strdup("Checking for ROM presence."));
+   task_set_title(task, strdup("Looking for compatible content..."));
    task_set_finished(task, false);
 
    if (!state->lpl_list)
    {
       task_set_progress(task, 100);
-      task_set_title(task, strdup("Playlist directory not found."));
+      task_set_title(task, strdup("Playlist directory not found"));
       task_set_finished(task, true);
       free(state);
       return;
@@ -113,7 +113,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
             state->found = true;
             task_set_data(task, state);
             task_set_progress(task, 100);
-            task_set_title(task, strdup("Game found."));
+            task_set_title(task, strdup("Compatible content found"));
             task_set_finished(task, true);
             string_list_free(state->lpl_list);
             return;
@@ -126,7 +126,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
 no_playlists:
    string_list_free(state->lpl_list);
    task_set_progress(task, 100);
-   task_set_title(task, strdup("No game found."));
+   task_set_title(task, strdup("Couldn't find compatible content"));
    task_set_finished(task, true);
    return;
 }
@@ -161,7 +161,7 @@ bool task_push_netplay_crc_scan(uint32_t crc,
    task->state          = state;
    task->handler        = task_netplay_crc_scan_handler;
    task->callback       = netplay_crc_scan_callback;
-   task->title          = strdup("Checking for ROM presence.");
+   task->title          = strdup("Looking for matching content...");
 
    task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);