diff --git a/azalea-protocol/src/packets/config/s_custom_click_action.rs b/azalea-protocol/src/packets/config/s_custom_click_action.rs
index 4c168884..eee03303 100644
--- a/azalea-protocol/src/packets/config/s_custom_click_action.rs
+++ b/azalea-protocol/src/packets/config/s_custom_click_action.rs
@@ -1,9 +1,10 @@
 use azalea_buf::AzBuf;
 use azalea_core::resource_location::ResourceLocation;
 use azalea_protocol_macros::ServerboundConfigPacket;
+use simdnbt::owned::Nbt;
 
 #[derive(Clone, Debug, AzBuf, ServerboundConfigPacket)]
 pub struct ServerboundCustomClickAction {
     pub id: ResourceLocation,
-    pub payload: Option<String>,
+    pub payload: Nbt,
 }
diff --git a/azalea-protocol/src/packets/game/c_waypoint.rs b/azalea-protocol/src/packets/game/c_waypoint.rs
index 0724d019..4975815e 100644
--- a/azalea-protocol/src/packets/game/c_waypoint.rs
+++ b/azalea-protocol/src/packets/game/c_waypoint.rs
@@ -66,14 +66,6 @@ struct CompactRgbColor {
     b: u8,
 }
 
-#[derive(AzBuf, Clone, Debug)]
-pub struct WaypointIconFade {
-    pub near_dist: i32,
-    pub far_dist: i32,
-    pub near_alpha: u8,
-    pub far_alpha: u8,
-}
-
 #[derive(AzBuf, Clone, Debug)]
 pub enum WaypointData {
     Empty,
diff --git a/azalea-protocol/src/packets/game/s_custom_click_action.rs b/azalea-protocol/src/packets/game/s_custom_click_action.rs
index 7215aaf6..4822fb65 100644
--- a/azalea-protocol/src/packets/game/s_custom_click_action.rs
+++ b/azalea-protocol/src/packets/game/s_custom_click_action.rs
@@ -1,9 +1,10 @@
 use azalea_buf::AzBuf;
 use azalea_core::resource_location::ResourceLocation;
 use azalea_protocol_macros::ServerboundGamePacket;
+use simdnbt::owned::Nbt;
 
 #[derive(Clone, Debug, AzBuf, ServerboundGamePacket)]
 pub struct ServerboundCustomClickAction {
     pub id: ResourceLocation,
-    pub payload: Option<String>,
+    pub payload: Nbt,
 }