diff --git a/Libretro/libretro.cpp b/Libretro/libretro.cpp
index 94cd6a82..20bccaa5 100644
--- a/Libretro/libretro.cpp
+++ b/Libretro/libretro.cpp
@@ -587,7 +587,7 @@ extern "C" {
 				keyMappings.Mapping1.ExcitingBoxingButtons[6] = getKeyCode(4, RETRO_DEVICE_ID_JOYPAD_X); //right jab
 				keyMappings.Mapping1.ExcitingBoxingButtons[7] = getKeyCode(4, RETRO_DEVICE_ID_JOYPAD_R); //straight
 			} else if(port == 1) {
-				keyMappings.Mapping1.Microphone = getKeyCode(1, RETRO_DEVICE_ID_JOYPAD_L3);
+				keyMappings.Mapping1.Microphone = getKeyCode(0, RETRO_DEVICE_ID_JOYPAD_L3);
 				keyMappings.Mapping1.PowerPadButtons[0] = getKeyCode(1, RETRO_DEVICE_ID_JOYPAD_B);
 				keyMappings.Mapping1.PowerPadButtons[1] = getKeyCode(1, RETRO_DEVICE_ID_JOYPAD_A);
 				keyMappings.Mapping1.PowerPadButtons[2] = getKeyCode(1, RETRO_DEVICE_ID_JOYPAD_Y);
@@ -781,8 +781,7 @@ extern "C" {
 						addDesc(port, RETRO_DEVICE_ID_JOYPAD_R, "(FDS) Switch Disk Side");
 						addDesc(port, RETRO_DEVICE_ID_JOYPAD_L2, "(VS) Insert Coin 1");
 						addDesc(port, RETRO_DEVICE_ID_JOYPAD_R2, "(VS) Insert Coin 2");
-					} else if(port == 1) {
-						addDesc(port, RETRO_DEVICE_ID_JOYPAD_L3, "(Famicom) Microphone");
+						addDesc(port, RETRO_DEVICE_ID_JOYPAD_L3, "(Famicom) Microphone (P2)");
 					}
 				}
 				addDesc(port, RETRO_DEVICE_ID_JOYPAD_START, "Start");
@@ -881,7 +880,8 @@ extern "C" {
 		}
 
 		bool hasFourScore = false;
-		if(_console->GetSettings()->GetExpansionDevice() != ExpansionPortDevice::None) {
+		bool isFamicom = (_console->GetSettings()->GetExpansionDevice() != ExpansionPortDevice::None || romInfo.System == GameSystem::Famicom || romInfo.System == GameSystem::FDS || romInfo.System == GameSystem::Dendy);
+		if(isFamicom) {
 			_console->GetSettings()->SetConsoleType(ConsoleType::Famicom);
 			if(_console->GetSettings()->GetExpansionDevice() == ExpansionPortDevice::FourPlayerAdapter) {
 				hasFourScore = true;