diff --git a/PKHeX.Core/Game/GameUtil.cs b/PKHeX.Core/Game/GameUtil.cs
index 8138a9e7b..72fbdf857 100644
--- a/PKHeX.Core/Game/GameUtil.cs
+++ b/PKHeX.Core/Game/GameUtil.cs
@@ -40,12 +40,13 @@ namespace PKHeX.Core
                 case GO:
                     return GO;
 
-                // Gen1
-                case RBY: case RD: case BU: case YW: case GN:
-                    return RBY;
+                // VC Transfers
+                case RD: case BU: case YW: case GN:
+                case GD: case SV: case C:
+                    return USUM;
 
-                // Gen2
-                case GS: case GD: case SV: case C:
+                // Gen2 -- PK2
+                case GS: case GSC:
                     return GSC;
 
                 // Gen3
diff --git a/PKHeX.Core/PKM/PK2.cs b/PKHeX.Core/PKM/PK2.cs
index f5dd1f1a8..eaf699360 100644
--- a/PKHeX.Core/PKM/PK2.cs
+++ b/PKHeX.Core/PKM/PK2.cs
@@ -88,7 +88,7 @@ namespace PKHeX.Core
         public override bool IsEgg { get; set; }
 
         public override bool HasOriginalMetLocation => CaughtData != 0;
-        public override int Version { get => HasOriginalMetLocation ? (int)GameVersion.C : (int)GameVersion.GSC; set { } }
+        public override int Version { get => (int)GameVersion.GSC; set { } }
 
         // Maximums
         public override int MaxMoveID => Legal.MaxMoveID_2;
@@ -136,7 +136,7 @@ namespace PKHeX.Core
                 PID = Util.Rand32(),
                 Ball = 4,
                 MetDate = DateTime.Now,
-                Version = CaughtData != 0 ? (int)GameVersion.C : (int)GameVersion.SV,
+                Version = HasOriginalMetLocation ? (int)GameVersion.C : (int)GameVersion.SV,
                 Move1 = Move1,
                 Move2 = Move2,
                 Move3 = Move3,
diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index 1f353d8ce..f733f7675 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
@@ -547,13 +547,14 @@ namespace PKHeX.WinForms.Controls
 
         private void ClickTRGender(object sender, EventArgs e)
         {
-            Label lbl = sender as Label;
-            if (!string.IsNullOrWhiteSpace(lbl?.Text)) // set gender label (toggle M/F)
-            {
-                int gender = PKX.GetGenderFromString(lbl.Text) ^ 1;
-                lbl.Text = gendersymbols[gender];
-                lbl.ForeColor = Draw.GetGenderColor(gender);
-            }
+            if (!(sender is Label lbl))
+                return;
+            if (string.IsNullOrWhiteSpace(lbl.Text))
+                return;
+
+            int gender = PKX.GetGenderFromString(lbl.Text) ^ 1;
+            lbl.Text = gendersymbols[gender];
+            lbl.ForeColor = Draw.GetGenderColor(gender);
         }
 
         private void ClickBall(object sender, EventArgs e)
@@ -1067,10 +1068,6 @@ namespace PKHeX.WinForms.Controls
 
             // check if differs
             var group = GameUtil.GetMetLocationVersionGroup(Version);
-            if (group == GameVersion.GSC && pkm.Format >= 7)
-                group = GameVersion.USUM;
-            else if (pkm.Format < 3)
-                group = GameVersion.GSC;
 
             if (group != origintrack)
                 ReloadMetLocations(Version);