diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
index 2b5e5965..c68fab97 100644
--- a/src/world/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/world/Network/Handlers/GMCommandHandlers.cpp
@@ -356,8 +356,8 @@ void Sapphire::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACK
 
         if( !targetPlayer->addItem( isHq ? param1 - 1000000 : param1, quantity, isHq, false, true, true ) )
           player.sendUrgent( "Item #{0} could not be added to inventory.", isHq ? param1 - 1000000 : param1 );
-        break;
       }
+      break;
     }
     case GmCommand::Gil:
     {
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index 795fc245..99e09152 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -749,13 +749,13 @@ void Sapphire::Network::GameConnection::worldInteractionhandler( const Packets::
         auto setpos = makeZonePacket< FFXIVIpcActorSetPos >( player.getId() );
         setpos->data().r16 = param4;
         setpos->data().waitForLoad = 18;
-        setpos->data().unknown1 = emote == 0x32 ? 1 : 2;
+        setpos->data().unknown1 = 1;
         setpos->data().x = packet.data().position.x;
         setpos->data().y = packet.data().position.y;
         setpos->data().z = packet.data().position.z;
         player.sendToInRangeSet( setpos, false );
       }
-      player.sendToInRangeSet( makeActorControlTarget( player.getId(), ActorControl::ActorControlType::Emote, emote, 0x12345678, 0x87654321, param4, 0xE0000000 ), true );
+      player.sendToInRangeSet( makeActorControlTarget( player.getId(), ActorControl::ActorControlType::Emote, emote, 0, 0, param4, 0xE0000000 ), true );
 
       if( emote == 0x32 && emoteData->emoteMode != 0 )
       {