diff --git a/deps/mbedtls/mbedtls/config.h b/deps/mbedtls/mbedtls/config.h
index ce2d4aab02..6ea52a9b32 100644
--- a/deps/mbedtls/mbedtls/config.h
+++ b/deps/mbedtls/mbedtls/config.h
@@ -906,7 +906,9 @@
  * Disable if you run into name conflicts and want to really remove the
  * mbedtls_strerror()
  */
+#if 0
 #define MBEDTLS_ERROR_STRERROR_DUMMY
+#endif
 
 /**
  * \def MBEDTLS_GENPRIME
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index bcb70d50dc..42fa203018 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -958,8 +958,11 @@ int generic_action_ok_displaylist_push(const char *path,
       case ACTION_OK_DL_LOAD_DISC_LIST:
       case ACTION_OK_DL_DUMP_DISC_LIST:
       case ACTION_OK_DL_CDROM_INFO_LIST:
+         action_ok_dl_lbl(action_ok_dl_to_enum(action_type), DISPLAYLIST_GENERIC);
+         break;
       case ACTION_OK_DL_CDROM_INFO_DETAIL_LIST:
          action_ok_dl_lbl(action_ok_dl_to_enum(action_type), DISPLAYLIST_GENERIC);
+         info_path          = label;
          break;
       case ACTION_OK_DL_CONTENT_SETTINGS:
          info.list          = menu_entries_get_selection_buf_ptr(0);