diff --git a/command.c b/command.c
index 528de34090..3f846fed1e 100644
--- a/command.c
+++ b/command.c
@@ -834,8 +834,10 @@ bool command_set(command_handle_t *handle)
 bool command_free(command_t *handle)
 {
 #if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD)
+#ifdef HAVE_COMMAND
    if (handle && handle->net_fd >= 0)
       socket_close(handle->net_fd);
+#endif
 #endif
 
    free(handle);
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 944791e075..5ef8a5a052 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -97,12 +97,13 @@ unsigned rpl_entry_selection_ptr                 = 0;
 unsigned rdb_entry_start_game_selection_ptr      = 0;
 size_t                     hack_shader_pass      = 0;
 
-#ifdef HAVE_NETWORKING
 /* HACK - we have to find some way to pass state inbetween
  * function pointer callback functions that don't necessarily
  * call each other. */
-char *core_buf;
-size_t core_len;
+char *core_buf                                   = NULL;
+size_t core_len                                  = 0;
+
+#ifdef HAVE_NETWORKING
 
 #ifdef HAVE_LAKKA
 static char lakka_project[128];