diff --git a/dynamic.c b/dynamic.c
index 32e7c7ecce..dd903518ea 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -64,7 +64,7 @@ void (*pretro_set_audio_sample_batch)(retro_audio_sample_batch_t);
 void (*pretro_set_input_poll)(retro_input_poll_t);
 void (*pretro_set_input_state)(retro_input_state_t);
 
-void (*pretro_set_controller_port_device)(bool, unsigned);
+void (*pretro_set_controller_port_device)(unsigned, unsigned);
 
 void (*pretro_reset)(void);
 void (*pretro_run)(void);
diff --git a/dynamic.h b/dynamic.h
index 6571e765f1..ce43604f7f 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -56,7 +56,7 @@ extern void (*pretro_set_audio_sample_batch)(retro_audio_sample_batch_t);
 extern void (*pretro_set_input_poll)(retro_input_poll_t);
 extern void (*pretro_set_input_state)(retro_input_state_t);
 
-extern void (*pretro_set_controller_port_device)(bool, unsigned);
+extern void (*pretro_set_controller_port_device)(unsigned, unsigned);
 
 extern void (*pretro_reset)(void);
 extern void (*pretro_run)(void);
diff --git a/file.c b/file.c
index 20ec073271..4ce5e5e944 100644
--- a/file.c
+++ b/file.c
@@ -647,8 +647,8 @@ static bool load_sufami_rom(void)
 {
    const char *path[3] = {
       *g_extern.fullpath ? g_extern.fullpath : NULL,
-      g_extern.sufami_rom_path[0] ? g_extern.sufami_rom_path[0] : NULL,
-      g_extern.sufami_rom_path[1] ? g_extern.sufami_rom_path[1] : NULL,
+      *g_extern.sufami_rom_path[0] ? g_extern.sufami_rom_path[0] : NULL,
+      *g_extern.sufami_rom_path[1] ? g_extern.sufami_rom_path[1] : NULL,
    };
 
    return load_roms(RETRO_GAME_TYPE_SUFAMI_TURBO, path, 3);