diff --git a/kubejs/data/minecraft/loot_tables/blocks/sniffer_egg.json b/kubejs/data/minecraft/loot_tables/blocks/sniffer_egg.json
new file mode 100644
index 000000000..5e462ab3e
--- /dev/null
+++ b/kubejs/data/minecraft/loot_tables/blocks/sniffer_egg.json
@@ -0,0 +1,20 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "tfg:sniffer_egg"
+				}
+			],
+			"conditions": [
+				{
+					"condition": "minecraft:survives_explosion"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/kubejs/data/species/loot_tables/blocks/wraptor_egg.json b/kubejs/data/species/loot_tables/blocks/wraptor_egg.json
new file mode 100644
index 000000000..5c0357973
--- /dev/null
+++ b/kubejs/data/species/loot_tables/blocks/wraptor_egg.json
@@ -0,0 +1,20 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "tfg:wraptor_egg"
+				}
+			],
+			"conditions": [
+				{
+					"condition": "minecraft:survives_explosion"
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js
index 17525850e..2d0e501ad 100644
--- a/kubejs/server_scripts/species/tags.js
+++ b/kubejs/server_scripts/species/tags.js
@@ -21,6 +21,9 @@ const registerSpeciesItemTags = (event) => {
 
 	event.add('forge:eggs', 'species:birt_egg')
 	event.add('firmalife:foods/raw_eggs', 'species:birt_egg')
+	event.add('tfg:martian_eggs', 'species:cruncher_egg')
+	event.add('tfg:martian_eggs', 'species:springling_egg')
+	event.add('tfg:martian_eggs', 'species:petrified_egg')
 	
 	event.add('species:goober_breed_items', '#forge:mushrooms')
 	event.add('species:cruncher_eats', '#tfc:foods/meat')
@@ -31,5 +34,5 @@ const registerSpeciesItemTags = (event) => {
 
 	event.add('minecraft:wart_blocks', 'species:alphacene_mushroom_block')
 
-	event.add('stackatick_tempt_items', 'tfc:sweetener')
+	event.add('species:stackatick_tempt_items', 'tfc:sweetener')
 }
diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js
index 21ef69ba9..f3febe335 100644
--- a/kubejs/server_scripts/tfg/tags.js
+++ b/kubejs/server_scripts/tfg/tags.js
@@ -794,6 +794,7 @@ const registerTFGItemTags = (event) => {
 	event.add('tfg:martian_eggs', 'tfg:sniffer_egg')
 	event.add('tfg:martian_eggs', 'tfg:wraptor_egg')
 	event.add('forge:eggs', '#tfg:martian_eggs')
+	event.add('firmalife:foods/raw_eggs', '#tfg:martian_eggs')
 	
 	event.add('tfg:martian_animal_foods', 'betterend:amber_root_product')
 	event.add('tfg:martian_animal_foods', 'betterend:blossom_berry_product')
diff --git a/kubejs/server_scripts/wan_ancient_beasts/tags.js b/kubejs/server_scripts/wan_ancient_beasts/tags.js
index faba038ac..044e0c9af 100644
--- a/kubejs/server_scripts/wan_ancient_beasts/tags.js
+++ b/kubejs/server_scripts/wan_ancient_beasts/tags.js
@@ -40,6 +40,14 @@ const registerWABItemTags = (event) => {
 
 	event.add('wan_ancient_beasts:surfer_food', '#firmalife:foods/raw_fish')
 	event.add('wan_ancient_beasts:eater_food', '#tfg:martian_animal_foods')
+
+	// Eggs
+	event.add('tfg:martian_eggs', 'wan_ancient_beasts:eater_egg')
+	event.add('tfg:martian_eggs', 'wan_ancient_beasts:walker_egg')
+	event.add('tfg:martian_eggs', 'wan_ancient_beasts:crusher_egg')
+	event.add('tfg:martian_eggs', 'wan_ancient_beasts:glider_egg')
+	event.add('tfg:martian_eggs', 'wan_ancient_beasts:soarer_egg')
+	event.add('tfg:martian_eggs', 'wan_ancient_beasts:surfer_egg')
 }
 
 const registerWABEntityTypeTags = (event) => {
diff --git a/kubejs/startup_scripts/species/constants.js b/kubejs/startup_scripts/species/constants.js
index 29bcbbfe2..881a885ca 100644
--- a/kubejs/startup_scripts/species/constants.js
+++ b/kubejs/startup_scripts/species/constants.js
@@ -13,7 +13,6 @@ global.SPECIES_DISABLED_BLOCKS = [
 global.SPECIES_DISABLED_ITEMS = [
 	'species:deepfish_bucket',
 	'species:ancient_pinecone',
-	'species:cruncher_egg',
 	'species:ichor_bottle',
 	'species:youth_potion',
 	'species:wraptor_egg',
@@ -33,7 +32,5 @@ global.SPECIES_DISABLED_ITEMS = [
 	'species:ghoul_tongue',
 	'species:broken_links',
 	'species:werefang',
-	'species:wicked_wax',
-	'species:springling_egg',
-	'species:petrified_egg'
+	'species:wicked_wax'
 ];
\ No newline at end of file
diff --git a/kubejs/startup_scripts/wan_ancient_beasts/constants.js b/kubejs/startup_scripts/wan_ancient_beasts/constants.js
index 6b17263f5..709f844d9 100644
--- a/kubejs/startup_scripts/wan_ancient_beasts/constants.js
+++ b/kubejs/startup_scripts/wan_ancient_beasts/constants.js
@@ -29,12 +29,6 @@ global.WAB_DISABLED_ITEMS = [
 	//'wan_ancient_beasts:glider_feather',
 	'wan_ancient_beasts:hang_glider',
 	//'wan_ancient_beasts:surfer_armor',
-	'wan_ancient_beasts:eater_egg',
-	'wan_ancient_beasts:walker_egg',
-	'wan_ancient_beasts:crusher_egg',
-	'wan_ancient_beasts:glider_egg',
-	'wan_ancient_beasts:soarer_egg',
-	'wan_ancient_beasts:surfer_egg',
 	'wan_ancient_beasts:frozen_ancient_meat',
 	//'wan_ancient_beasts:raw_ancient_meat',
 	//'wan_ancient_beasts:cooked_ancient_meat',