diff --git a/driver.c b/driver.c
index 7e7d609955..30e0a1e49a 100644
--- a/driver.c
+++ b/driver.c
@@ -35,6 +35,7 @@
 #include "wifi/wifi_driver.h"
 #include "led/led_driver.h"
 #include "midi/midi_driver.h"
+#include "command.h"
 #include "configuration.h"
 #include "core_info.h"
 #include "driver.h"
diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index a69f49decb..d234e1000d 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -961,7 +961,8 @@ void fill_pathname_join_delim(char *out_path, const char *dir,
    out_path[copied]   = delim;
    out_path[copied+1] = '\0';
 
-   strlcat(out_path, path, size);
+   if (path)
+      strlcat(out_path, path, size);
 }
 
 void fill_pathname_join_delim_concat(char *out_path, const char *dir,
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 9d2312797d..a1a818bcdd 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -569,7 +569,8 @@ if [ "$HAVE_MATERIALUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH"
       HAVE_STRIPES=no
       HAVE_ZARCH=no
       HAVE_OZONE=no
-      die : 'Notice: RGUI not available, MaterialUI, XMB, Ozone and ZARCH will also be disabled.'
+      HAVE_QT=no
+      die : 'Notice: RGUI not available, other menus will also be disabled.'
    elif [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_OPENGLES" = 'no' ] && [ "$HAVE_VULKAN" = 'no' ]; then
       if [ "$OS" = 'Win32' ]; then
          HAVE_SHADERPIPELINE=no