diff --git a/src/main/java/gregapi/data/FL.java b/src/main/java/gregapi/data/FL.java
index e122af533..551eb6c1a 100644
--- a/src/main/java/gregapi/data/FL.java
+++ b/src/main/java/gregapi/data/FL.java
@@ -620,6 +620,8 @@ private FL(String aName, String aOldName1, String aOldName2, Collection<String>.
 	public boolean is(String aFluidName) {return mName.equalsIgnoreCase(aFluidName);}
 	public boolean is(Collection<String> aFluidSet) {return aFluidSet.contains(mName);}
 	
+	public ItemStack fill(ItemStack aStack) {return fill(make(Integer.MAX_VALUE), aStack, F, T, T, F);}
+	
 	
 	
 	
diff --git a/src/main/java/gregtech/GT_Proxy.java b/src/main/java/gregtech/GT_Proxy.java
index ead9286f9..b33c1403b 100644
--- a/src/main/java/gregtech/GT_Proxy.java
+++ b/src/main/java/gregtech/GT_Proxy.java
@@ -227,21 +227,21 @@ public void onPlayerInteraction(PlayerInteractEvent aEvent) {
 						return;
 					}
 					if (tBlock == BlocksGT.River || WD.waterstream(tBlock)) {
-						ItemStack tStack = FL.fill(FL.Water.make(Integer.MAX_VALUE), aStack, F, T, F, T);
+						ItemStack tStack = FL.Water.fill(aStack);
 						if (tStack == null) return;
 						ST.use(aEvent.entityPlayer, aStack);
 						UT.Inventories.addStackToPlayerInventoryOrDrop(aEvent.entityPlayer, tStack, F);
 						return;
 					}
 					if (tBlock == BlocksGT.Ocean) {
-						ItemStack tStack = FL.fill(FL.Ocean.make(Integer.MAX_VALUE), aStack, F, T, F, T);
+						ItemStack tStack = FL.Ocean.fill(aStack);
 						if (tStack == null) return;
 						ST.use(aEvent.entityPlayer, aStack);
 						UT.Inventories.addStackToPlayerInventoryOrDrop(aEvent.entityPlayer, tStack, F);
 						return;
 					}
 					if (tBlock == BlocksGT.Swamp) {
-						ItemStack tStack = FL.fill(FL.Dirty_Water.make(Integer.MAX_VALUE), aStack, F, T, F, T);
+						ItemStack tStack = FL.Dirty_Water.fill(aStack);
 						if (tStack == null) return;
 						ST.use(aEvent.entityPlayer, aStack);
 						UT.Inventories.addStackToPlayerInventoryOrDrop(aEvent.entityPlayer, tStack, F);
diff --git a/src/main/java/gregtech/compat/Compat_Recipes_Thaumcraft.java b/src/main/java/gregtech/compat/Compat_Recipes_Thaumcraft.java
index 6a602cfb1..836a8d298 100644
--- a/src/main/java/gregtech/compat/Compat_Recipes_Thaumcraft.java
+++ b/src/main/java/gregtech/compat/Compat_Recipes_Thaumcraft.java
@@ -116,19 +116,19 @@ public class Compat_Recipes_Thaumcraft extends CompatMods {
 			, LH.add("gt.research.page.1." + tKey, "You have discovered a way of filling a Bucket with aqua essentia in order to simply get Water.")
 			, COMPAT_TC.addCrucibleRecipe(tKey, ST.make(Items.bucket            , 1, W), ST.make(Items.water_bucket, 1, 0), TC.stack(TC.AQUA, 4))
 			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Cell_Empty                   .get(1), IL.Cell_Water.get(1), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_MagicCapsule              .get(1), FL.fill(FL.Water.make(16000), IL.FR_MagicCapsule              .get(1), F, F), TC.stack(TC.AQUA,10))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_TinCapsule                .get(1), FL.fill(FL.Water.make( 1000), IL.FR_TinCapsule                .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_WaxCapsule                .get(1), FL.fill(FL.Water.make( 1000), IL.FR_WaxCapsule                .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_RefractoryCapsule         .get(1), FL.fill(FL.Water.make( 1000), IL.FR_RefractoryCapsule         .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Copper         .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Copper         .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Tin            .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Tin            .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Zinc           .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Zinc           .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Lead           .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Lead           .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Bismuth        .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Bismuth        .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Brass          .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Brass          .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Bronze         .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Bronze         .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_BismuthBronze  .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_BismuthBronze  .get(1), F, F), TC.stack(TC.AQUA, 4))
-			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Gold           .get(1), FL.fill(FL.Water.make( 1000), IL.Wooden_Bucket_Gold           .get(1), F, F), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_MagicCapsule              .get(1), FL.Water.fill(IL.FR_MagicCapsule              .get(1)), TC.stack(TC.AQUA,10))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_TinCapsule                .get(1), FL.Water.fill(IL.FR_TinCapsule                .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_WaxCapsule                .get(1), FL.Water.fill(IL.FR_WaxCapsule                .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.FR_RefractoryCapsule         .get(1), FL.Water.fill(IL.FR_RefractoryCapsule         .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Copper         .get(1), FL.Water.fill(IL.Wooden_Bucket_Copper         .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Tin            .get(1), FL.Water.fill(IL.Wooden_Bucket_Tin            .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Zinc           .get(1), FL.Water.fill(IL.Wooden_Bucket_Zinc           .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Lead           .get(1), FL.Water.fill(IL.Wooden_Bucket_Lead           .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Bismuth        .get(1), FL.Water.fill(IL.Wooden_Bucket_Bismuth        .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Brass          .get(1), FL.Water.fill(IL.Wooden_Bucket_Brass          .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Bronze         .get(1), FL.Water.fill(IL.Wooden_Bucket_Bronze         .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_BismuthBronze  .get(1), FL.Water.fill(IL.Wooden_Bucket_BismuthBronze  .get(1)), TC.stack(TC.AQUA, 4))
+			, COMPAT_TC.addCrucibleRecipe(tKey, IL.Wooden_Bucket_Gold           .get(1), FL.Water.fill(IL.Wooden_Bucket_Gold           .get(1)), TC.stack(TC.AQUA, 4))
 		);
 		tMat = MT.Zn;
 		COMPAT_TC.addResearch(tKey = TRANSZINC
diff --git a/src/main/java/gregtech/worldgen/TwilightTreasureReplacer.java b/src/main/java/gregtech/worldgen/TwilightTreasureReplacer.java
index 576e3659c..8590727d5 100644
--- a/src/main/java/gregtech/worldgen/TwilightTreasureReplacer.java
+++ b/src/main/java/gregtech/worldgen/TwilightTreasureReplacer.java
@@ -20,10 +20,7 @@
 package gregtech.worldgen;
 
 import gregapi.block.multitileentity.MultiTileEntityRegistry;
-import gregapi.data.IL;
-import gregapi.data.MD;
-import gregapi.data.MT;
-import gregapi.data.OP;
+import gregapi.data.*;
 import gregapi.util.ST;
 import gregapi.util.UT;
 import gregapi.util.WD;
@@ -126,7 +123,7 @@ public TwilightTreasureReplacer(TFTreasure aTreasure, int aIndex, String aCatego
 			useless  .add(IL.Dye_SquidInk.get(36));
 			useless  .add(IL.Bottle_Ink.get(16));
 			useless  .add(Items.feather, 8);
-			useless  .add(IL.Porcelain_Cup.get(4));
+			useless  .add(FL.Potion_NightVision_1L.fill(IL.Porcelain_Cup.get(1)));
 			useless  .add(IL.Food_Pickle.get(8));
 			// Add a Death Compass to the Ultra Rares, even though it is super easy to get.
 			ultrarare.add(IL.Compass_Death.get(1));