diff --git a/build.gradle.kts b/build.gradle.kts
index f681cdf5..b0d47828 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.0.0-21w19a-SNAPSHOT"
+    version = "4.0.0-21w20a-SNAPSHOT"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
index fe04dccf..04752406 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
@@ -70,7 +70,8 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPackets1_
         blockItemPackets = new BlockItemPackets1_17(this, translatableRewriter);
         blockItemPackets.register();
 
-        new EntityPackets1_17(this).register();
+        EntityPackets1_17 entityPackets = new EntityPackets1_17(this);
+        entityPackets.register();
 
         SoundRewriter soundRewriter = new SoundRewriter(this);
         soundRewriter.registerSound(ClientboundPackets1_17.SOUND);
@@ -78,7 +79,7 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPackets1_
         soundRewriter.registerNamedSound(ClientboundPackets1_17.NAMED_SOUND);
         soundRewriter.registerStopSound(ClientboundPackets1_17.STOP_SOUND);
 
-        TagRewriter tagRewriter = new TagRewriter(this, null);
+        TagRewriter tagRewriter = new TagRewriter(this, entityPackets::getOldEntityId);
         registerClientbound(ClientboundPackets1_17.TAGS, new PacketRemapper() {
             @Override
             public void registerMap() {
diff --git a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
index 8b18219a..0bd833c8 100644
--- a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
+++ b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
@@ -1388,7 +1388,8 @@
     "entity.goat.screaming.eat": "",
     "entity.goat.screaming.long_jump": "",
     "entity.goat.screaming.prepare_ram": "",
-    "entity.goat.screaming.ram_impact": ""
+    "entity.goat.screaming.ram_impact": "",
+    "block.sweet_berry_bush.pick_berries": "item.sweet_berries.pick_from_bush"
   },
   "particles": {
     "small_flame": "flame",
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e5338d37..0f80bbf5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists