diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs
index 6732a92..802d92d 100644
--- a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs
+++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs
@@ -78,7 +78,6 @@ namespace RJW_Menstruation
                     kind: babyPawnKind,
                     faction: mother.Faction,
                     allowDowned: true,
-                    // fixedLastName seems not to actually do anything, as we eventually end up in PawnBioAndNameGenerator.NameResolvedFrom, which ignores its forcedLastName argument
                     fixedLastName: (string)RandomLastName.Invoke(null, new object[] { mother, mother, xxx.is_human(father) ? father : null }),
                     forceNoIdeo: true,
                     forcedEndogenes: PregnancyUtility.GetInheritedGenes(father, mother),
@@ -96,7 +95,7 @@ namespace RJW_Menstruation
                 PregnancyCommon.SetupBabyXenotype(mother, father, baby);    // Probably redundant with Biotech post-birth xenotyping
                 // HAR and some xenotype mods don't randomize graphics until it's rendered
                 // So poke it early
-                baby.Drawer.renderer.renderTree.EnsureInitialized(PawnRenderFlags.DrawNow);
+                baby.Drawer.renderer.EnsureGraphicsInitialized();
                 
                 if (division > 1)
                 {
diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
index cf3fbbb..531a911 100644
--- a/1.5/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
+++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
@@ -332,7 +332,7 @@ namespace RJW_Menstruation
                 PregnancyCommon.SetupBabyXenotype(mother, father, baby);
                 // HAR and some xenotype mods don't randomize graphics until it's rendered
                 // So poke it early
-                baby.Drawer.renderer.renderTree.EnsureInitialized(PawnRenderFlags.DrawNow);
+                baby.Drawer.renderer.EnsureGraphicsInitialized();
 
                 if (division > 1)
                 {
diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
index d4a6f94..e580ccf 100644
--- a/1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
+++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
@@ -108,7 +108,6 @@ namespace RJW_Menstruation
             else comp = partner.GetRandomMenstruationComp();
             if (comp == null)
             {
-                if (Configurations.Debug) ModLog.Message("used original rjw method: Comp missing");
                 return true;
             }
             else if (AndroidsCompatibility.IsAndroid(pawn) && !AndroidsCompatibility.AndroidPenisFertility(pawn))
diff --git a/changelogs.txt b/changelogs.txt
index fc2e2f7..beb35b2 100644
--- a/changelogs.txt
+++ b/changelogs.txt
@@ -2,6 +2,7 @@ Version 1.5.0.0
  - Support for RimWorld 1.5. All future changes to Menstruation will only be for RimWorld 1.5.
  - Updated Traditional Chinese translation by Hydrogen.
  - Inactive genes will no longer be applied to wombs.
+ - Fix babies becoming the wrong pawnkind in some scenarios.
 
 Version 1.0.9.4
  - Added graphics for the menstruation genes with thanks to Alpenglow.