diff --git a/gradle.properties b/gradle.properties
index 1679f2e3..473c0066 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check https://fabricmc.net/develop/
-	minecraft_version=25w03a
+	minecraft_version=25w04a
 	loader_version=0.16.10
 	jsr305_version=3.0.2
 	fabric_version=0.110.5+1.21.4
diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java
index 16731668..55ca1f38 100644
--- a/src/main/java/carpet/script/value/EntityValue.java
+++ b/src/main/java/carpet/script/value/EntityValue.java
@@ -301,7 +301,7 @@ public class EntityValue extends Value
                     EntityType.ARROW, EntityType.DRAGON_FIREBALL, EntityType.FIREWORK_ROCKET,
                     EntityType.FIREBALL, EntityType.LLAMA_SPIT, EntityType.SMALL_FIREBALL,
                     EntityType.SNOWBALL, EntityType.SPECTRAL_ARROW, EntityType.EGG,
-                    EntityType.ENDER_PEARL, EntityType.EXPERIENCE_BOTTLE, EntityType.POTION,
+                    EntityType.ENDER_PEARL, EntityType.EXPERIENCE_BOTTLE, EntityType.SPLASH_POTION, EntityType.LINGERING_POTION,
                     EntityType.TRIDENT, EntityType.WITHER_SKULL, EntityType.FISHING_BOBBER, EntityType.SHULKER_BULLET
             );
             Set<EntityType<?>> deads = Set.of(
diff --git a/src/main/java/carpet/script/value/NBTSerializableValue.java b/src/main/java/carpet/script/value/NBTSerializableValue.java
index f6df234c..a3258f7c 100644
--- a/src/main/java/carpet/script/value/NBTSerializableValue.java
+++ b/src/main/java/carpet/script/value/NBTSerializableValue.java
@@ -32,6 +32,7 @@ import net.minecraft.nbt.EndTag;
 import net.minecraft.nbt.IntTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.LongTag;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.NumericTag;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.nbt.Tag;
@@ -74,7 +75,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
         {
             try
             {
-                return (new TagParser(new StringReader(nbtString))).readValue();
+                return TagParser.parseAsArgument(NbtOps.INSTANCE, new StringReader(nbtString));
             }
             catch (CommandSyntaxException e)
             {
@@ -127,7 +128,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
     {
         try
         {
-            Tag tag = (new TagParser(new StringReader(nbtString))).readValue();
+            Tag tag = TagParser.parseAsArgument(NbtOps.INSTANCE, new StringReader(nbtString));
             NBTSerializableValue value = new NBTSerializableValue(tag);
             value.nbtString = null;
             return value;