diff --git a/manual_content_scan.c b/manual_content_scan.c
index ae5f345e33..c93ec636cd 100644
--- a/manual_content_scan.c
+++ b/manual_content_scan.c
@@ -39,6 +39,13 @@
  * with a manual content scan */
 typedef struct
 {
+   bool search_archives;
+   bool filter_dat_content;
+   bool overwrite_playlist;
+
+   enum manual_content_scan_system_name_type system_name_type;
+   enum manual_content_scan_core_type core_type;
+
    char content_dir[PATH_MAX_LENGTH];
    char system_name_content_dir[PATH_MAX_LENGTH];
    char system_name_database[PATH_MAX_LENGTH];
@@ -48,11 +55,6 @@ typedef struct
    char file_exts_core[PATH_MAX_LENGTH];
    char file_exts_custom[PATH_MAX_LENGTH];
    char dat_file_path[PATH_MAX_LENGTH];
-   enum manual_content_scan_system_name_type system_name_type;
-   enum manual_content_scan_core_type core_type;
-   bool search_archives;
-   bool filter_dat_content;
-   bool overwrite_playlist;
 } scan_settings_t;
 
 /* Static settings object
diff --git a/verbosity.c b/verbosity.c
index fb6d76fd61..cb71e414e4 100644
--- a/verbosity.c
+++ b/verbosity.c
@@ -89,9 +89,13 @@ static char log_file_override_path[PATH_MAX_LENGTH] = {0};
 
 #ifdef HAVE_LIBNX
 static Mutex logging_mtx;
+
 #ifdef NXLINK
+/* TODO/FIXME - global referenced in platform_switch.c - not
+ * thread-safe */
 bool nxlink_connected = false;
 #endif /* NXLINK */
+
 #endif /* HAVE_LIBNX */
 
 void verbosity_set_log_level(unsigned level)