diff --git a/src/common/Common.h b/src/common/Common.h
index b03618ef..dc05310d 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -776,8 +776,8 @@ namespace Core::Common
 
   enum LandFlags : uint32_t
   {
-    ESTATE_BUILT = 0x1,
-    ESTATE_HAS_AETHERYTE = 0x2,
+    EstateBuilt = 0x1,
+    HasAetheryte = 0x2,
     UNKNOWN_1 = 0x4,
     UNKNOWN_2 = 0x8,
     UNKNOWN_3 = 0x10,
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 79f24075..c286833c 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -1597,10 +1597,10 @@ void Core::Entity::Player::sendZonePackets()
 
     if( pLand->getHouse() )
     {
-      state |= ESTATE_BUILT;
+      state |= EstateBuilt;
 
       // todo: remove this, debug for now
-      state |= ESTATE_HAS_AETHERYTE;
+      state |= HasAetheryte;
     }
 
     setLandFlags( LandFlagsSlot::Private, state, pLand->getLandId(), pLand->getWardNum(), pLand->getTerritoryTypeId() );
diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
index 444a01dc..7e06e9fa 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
@@ -365,7 +365,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
       uint16_t territoryTypeId = param11 & 0xFFFF;
       uint16_t worldId = param11 >> 16;
 
-      uint8_t ward = ( param12 & 0xFF00 ) >> 8;
+      uint8_t ward = ( param12 >> 16 ) & 0xFF;
       uint8_t plot = ( param12 & 0xFF );
 
       auto pHousingMgr = g_fw.get< HousingMgr >();
@@ -381,7 +381,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
       uint16_t territoryTypeId = param11 & 0xFFFF;
       uint16_t worldId = param11 >> 16;
 
-      uint8_t ward = ( param12 & 0xFF00 ) >> 8;
+      uint8_t ward = ( param12 >> 16 ) & 0xFF;
       uint8_t plot = ( param12 & 0xFF );
 
       auto pHousingMgr = g_fw.get< HousingMgr >();
@@ -397,7 +397,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
       uint16_t territoryTypeId = param11 & 0xFFFF;
       uint16_t worldId = param11 >> 16;
 
-      uint8_t ward = ( param12 & 0xFF00 ) >> 8;
+      uint8_t ward = ( param12 >> 16 ) & 0xFF;
       uint8_t plot = ( param12 & 0xFF );
 
       auto pHousingMgr = g_fw.get< HousingMgr >();
diff --git a/src/servers/sapphire_zone/Zone/HousingMgr.cpp b/src/servers/sapphire_zone/Zone/HousingMgr.cpp
index 09476248..868cbd79 100644
--- a/src/servers/sapphire_zone/Zone/HousingMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/HousingMgr.cpp
@@ -319,7 +319,7 @@ void Core::HousingMgr::buildPresetEstate( Entity::Player& player, uint8_t plotNu
   // todo: wtf are these flags
   player.playScene( 0x000B0095, 0, 4164955899, 0, 1, plotNum, nullptr );
 
-  player.setLandFlags( LandFlagsSlot::Private, ESTATE_BUILT, pLand->getLandId(), pLand->getWardNum(), pLand->getTerritoryTypeId() );
+  player.setLandFlags( LandFlagsSlot::Private, EstateBuilt, pLand->getLandId(), pLand->getWardNum(), pLand->getTerritoryTypeId() );
   player.sendLandFlagsSlot( LandFlagsSlot::Private );
 }