diff --git a/build.gradle.kts b/build.gradle.kts
index e2c2887a..c058c0a7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "nl.matsv"
-    version = "3.3.0-21w14a"
+    version = "3.3.0-21w15a"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
index d8183724..17b62c29 100644
--- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
+++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
@@ -144,6 +144,7 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPackets1_
                     wrapper.passthrough(Type.STRING);
                     wrapper.passthrough(Type.STRING);
                     wrapper.read(Type.BOOLEAN); // Required
+                    wrapper.read(Type.OPTIONAL_COMPONENT); // Prompt message
                 });
             }
         });
diff --git a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
index 447aacfd..df35e34d 100644
--- a/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
+++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
@@ -188,6 +188,8 @@ public class EntityPackets1_17 extends EntityRewriter<Protocol1_16_4To1_17> {
 
         registerMetaHandler().filter(Entity1_17Types.GLOW_SQUID, 16).removed();
 
+        registerMetaHandler().filter(Entity1_17Types.GOAT, 16).removed();
+
         mapEntity(Entity1_17Types.AXOLOTL, Entity1_17Types.TROPICAL_FISH).jsonName("Axolotl");
         mapEntity(Entity1_17Types.GOAT, Entity1_17Types.SHEEP).jsonName("Goat");
 
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 6769314b..5a733fb0 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
@@ -729,7 +729,10 @@
     "minecraft:deepslate_emerald_ore": "minecraft:emerald_ore",
     "minecraft:deepslate_copper_ore": "minecraft:iron_ore",
     "minecraft:infested_deepslate": "minecraft:coal_ore",
-    "minecraft:light": "minecraft:air"
+    "minecraft:light": "minecraft:air",
+    "minecraft:raw_iron_block": "minecraft:iron_block",
+    "minecraft:raw_copper_block": "minecraft:iron_block",
+    "minecraft:raw_gold_block": "minecraft:gold_block"
   },
   "items": {
     "minecraft:dirt_path": {
@@ -1219,6 +1222,19 @@
     "minecraft:goat_spawn_egg": {
       "id": "minecraft:silverfish_spawn_egg",
       "name": "1.17 Goat Spawn Egg"
+    },
+
+    "minecraft:raw_iron_block": {
+      "id": "minecraft:iron_block",
+      "name": "1.17 Raw Iron Block"
+    },
+    "minecraft:raw_copper_block": {
+      "id": "minecraft:iron_block",
+      "name": "1.17 Raw Copper Block"
+    },
+    "minecraft:raw_gold_block": {
+      "id": "minecraft:gold_block",
+      "name": "1.17 Raw Gold Block"
     }
   },
   "sounds": {
@@ -1412,7 +1428,15 @@
     "entity.goat.screaming.hurt": "",
     "entity.goat.screaming.milk": "",
     "entity.goat.screaming.ram": "",
-    "entity.goat.step": ""
+    "entity.goat.step": "",
+    "item.bone_meal.use": "",
+    "entity.goat.eat": "",
+    "entity.goat.long_jump": "",
+    "entity.goat.ram_impact": "",
+    "entity.goat.screaming.eat": "",
+    "entity.goat.screaming.long_jump": "",
+    "entity.goat.screaming.prepare_ram": "",
+    "entity.goat.screaming.ram_impact": ""
   },
   "particles": {
     "small_flame": "flame",