diff --git a/src/ImprovedWorkbenches/Detours/Pawn_Spawn_Detour.cs b/src/ImprovedWorkbenches/Detours/Pawn_Spawn_Detour.cs
index 076918f..419a6bb 100644
--- a/src/ImprovedWorkbenches/Detours/Pawn_Spawn_Detour.cs
+++ b/src/ImprovedWorkbenches/Detours/Pawn_Spawn_Detour.cs
@@ -27,7 +27,7 @@ public static void Postfix(Pawn __instance, Map map, bool respawningAfterLoad)
             if (__instance.HasOriginMap() && map.IsPlayerHome)
             {
                 //Pawn is there ; doesn't need to remember it
-                __instance.SetOriginMap(null); 
+                __instance.SetOriginMap(null);
             }
         }
     }
diff --git a/src/ImprovedWorkbenches/Detours/RecipeWorkerCounter_CountProducts_Detour.cs b/src/ImprovedWorkbenches/Detours/RecipeWorkerCounter_CountProducts_Detour.cs
index 9ed73e7..1b68146 100644
--- a/src/ImprovedWorkbenches/Detours/RecipeWorkerCounter_CountProducts_Detour.cs
+++ b/src/ImprovedWorkbenches/Detours/RecipeWorkerCounter_CountProducts_Detour.cs
@@ -40,7 +40,7 @@ public static void Postfix(ref RecipeWorkerCounter __instance, ref int __result,
 
 
             // Look for matching items in colonists and animals away from base
-            foreach (var pawn in Find.WorldPawns.AllPawnsAlive)
+            foreach (var pawn in PawnsFinder.AllMapsCaravansAndTravelingTransportPods_Alive_OfPlayerFaction)
             {
                 if (pawn.GetOriginMap() != billMap)
                     // OriginMap is only set on our pawns who are away from base
diff --git a/src/ImprovedWorkbenches/Properties/AssemblyInfo.cs b/src/ImprovedWorkbenches/Properties/AssemblyInfo.cs
index 7e205fe..ef445c5 100644
--- a/src/ImprovedWorkbenches/Properties/AssemblyInfo.cs
+++ b/src/ImprovedWorkbenches/Properties/AssemblyInfo.cs
@@ -31,8 +31,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]