diff --git a/DataSpec/SpecBase.cpp b/DataSpec/SpecBase.cpp
index d3395c734..cfcf36cd8 100644
--- a/DataSpec/SpecBase.cpp
+++ b/DataSpec/SpecBase.cpp
@@ -73,7 +73,7 @@ bool SpecBase::canExtract(const ExtractPassInfo& info, std::vector<ExtractReport
     }
 
     m_standalone = true;
-    if (m_isWii && !memcmp(gameID, "R3M", 3))
+    if (m_isWii && (!memcmp(gameID, "R3M", 3) || !memcmp(gameID, "R3I", 3) || !memcmp(gameID, "R32", 3)))
         m_standalone = false;
 
     if (m_standalone && !checkStandaloneID(gameID))
diff --git a/DataSpec/SpecMP1.cpp b/DataSpec/SpecMP1.cpp
index 3026ab401..582c27cd1 100644
--- a/DataSpec/SpecMP1.cpp
+++ b/DataSpec/SpecMP1.cpp
@@ -336,7 +336,11 @@ struct SpecMP1 : SpecBase
         /* Iterate PAKs and build level options */
         nod::Node::DirectoryIterator mp1It = root.find("MP1");
         if (mp1It == root.end())
-            return false;
+        {
+            mp1It = root.find("MP1JPN");
+            if (mp1It == root.end())
+                return false;
+        }
         buildPaks(*mp1It, mp1args, rep);
 
         return true;
diff --git a/DataSpec/SpecMP2.cpp b/DataSpec/SpecMP2.cpp
index 34c9f1b2b..a5f890d4f 100644
--- a/DataSpec/SpecMP2.cpp
+++ b/DataSpec/SpecMP2.cpp
@@ -204,7 +204,11 @@ struct SpecMP2 : SpecBase
         /* Iterate PAKs and build level options */
         nod::Node::DirectoryIterator mp2It = root.find("MP2");
         if (mp2It == root.end())
-            return false;
+        {
+            mp2It = root.find("MP2JPN");
+            if (mp2It == root.end())
+                return false;
+        }
         buildPaks(*mp2It, mp2args, rep);
 
         return true;
diff --git a/DataSpec/SpecMP3.cpp b/DataSpec/SpecMP3.cpp
index ce4a975a7..bc8ba7836 100644
--- a/DataSpec/SpecMP3.cpp
+++ b/DataSpec/SpecMP3.cpp
@@ -261,21 +261,30 @@ struct SpecMP3 : SpecBase
         nod::Node& root = partition->getFSTRoot();
 
         /* MP3 extract */
-        if (doMP3)
+        while (doMP3)
         {
             nod::Node::DirectoryIterator dolIt = root.find("rs5mp3_p.dol");
             if (dolIt == root.end())
-                return false;
+            {
+                doMP3 = false;
+                break;
+            }
 
             std::unique_ptr<uint8_t[]> dolBuf = dolIt->getBuf();
             const char* buildInfo = (char*)memmem(dolBuf.get(), dolIt->size(), "MetroidBuildInfo", 16) + 19;
 
             if (!buildInfo)
-                return false;
+            {
+                doMP3 = false;
+                break;
+            }
 
             /* We don't want no stinking demo dammit */
             if (!strcmp(buildInfo, "Build v3.068 3/2/2006 14:55:13"))
-                return false;
+            {
+                doMP3 = false;
+                break;
+            }
 
             /* Root Report */
             reps.emplace_back();
@@ -291,16 +300,23 @@ struct SpecMP3 : SpecBase
             /* Iterate PAKs and build level options */
             nod::Node::DirectoryIterator mp3It = root.find("MP3");
             if (mp3It == root.end())
-                return false;
+            {
+                doMP3 = false;
+                break;
+            }
             buildPaks(*mp3It, mp3args, rep, false);
+            break;
         }
 
         /* MPT Frontend extract */
-        if (doMPTFE)
+        while (doMPTFE)
         {
             nod::Node::DirectoryIterator dolIt = root.find("rs5fe_p.dol");
             if (dolIt == root.end())
-                return false;
+            {
+                doMPTFE = false;
+                break;
+            }
 
             std::unique_ptr<uint8_t[]> dolBuf = dolIt->getBuf();
             const char* buildInfo = (char*)memmem(dolBuf.get(), dolIt->size(), "MetroidBuildInfo", 16) + 19;
@@ -320,11 +336,15 @@ struct SpecMP3 : SpecBase
             /* Iterate PAKs and build level options */
             nod::Node::DirectoryIterator feIt = root.find("fe");
             if (feIt == root.end())
-                return false;
+            {
+                doMPTFE = false;
+                break;
+            }
             buildPaks(*feIt, feargs, rep, true);
+            break;
         }
 
-        return true;
+        return doMP3 || doMPTFE;
     }
 
     bool extractFromDisc(nod::DiscBase&, bool force, FProgress progress)