diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp
index dd1c91a639..aed97e083e 100644
--- a/src/openrct2/entity/Guest.cpp
+++ b/src/openrct2/entity/Guest.cpp
@@ -838,7 +838,7 @@ void Guest::Loc68FA89()
     }
     else
     {
-        newEnergy = std::min(kPeepMaxEnergyTarget, newEnergy + 4);
+        newEnergy = std::min<uint16_t>(kPeepMaxEnergyTarget, newEnergy + 4);
         if (newEnergy > newTargetEnergy)
             newEnergy = newTargetEnergy;
     }
@@ -3035,7 +3035,7 @@ static void PeepUpdateHunger(Guest* peep)
     {
         peep->Hunger -= 2;
 
-        peep->EnergyTarget = std::min(peep->EnergyTarget + 2, kPeepMaxEnergyTarget);
+        peep->EnergyTarget = std::min<uint16_t>(peep->EnergyTarget + 2, kPeepMaxEnergyTarget);
         peep->Toilet = std::min(peep->Toilet + 1, 255);
     }
 }
diff --git a/src/openrct2/entity/Peep.h b/src/openrct2/entity/Peep.h
index c46704c53e..2ad9e98f99 100644
--- a/src/openrct2/entity/Peep.h
+++ b/src/openrct2/entity/Peep.h
@@ -23,7 +23,7 @@
 
 constexpr uint8_t kPeepMinEnergy = 32;
 constexpr uint8_t kPeepMaxEnergy = 128;
-constexpr int kPeepMaxEnergyTarget = 255; // Oddly, this differs from max energy!
+constexpr uint8_t kPeepMaxEnergyTarget = 255; // Oddly, this differs from max energy!
 
 constexpr auto PEEP_CLEARANCE_HEIGHT = 4 * COORDS_Z_STEP;
 
diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp
index f51abf981b..0189d69472 100644
--- a/src/openrct2/interface/Chat.cpp
+++ b/src/openrct2/interface/Chat.cpp
@@ -97,7 +97,7 @@ void ChatDraw(DrawPixelInfo& dpi, uint8_t chatBackgroundColor)
     }
 
     _chatLeft = 10;
-    _chatRight = std::min((ContextGetWidth() - 10), CHAT_MAX_WINDOW_WIDTH);
+    _chatRight = std::min<int16_t>((ContextGetWidth() - 10), kChatMaxWindowWidth);
     _chatWidth = _chatRight - _chatLeft;
     _chatBottom = ContextGetHeight() - 45;
     _chatTop = _chatBottom - 10;
diff --git a/src/openrct2/interface/Chat.h b/src/openrct2/interface/Chat.h
index 6d9b1d8c85..e55a8fbeed 100644
--- a/src/openrct2/interface/Chat.h
+++ b/src/openrct2/interface/Chat.h
@@ -16,8 +16,8 @@
 
 constexpr int8_t kChatHistorySize = 10;
 constexpr int16_t kChatInputSize = 1024;
-constexpr int kChatMaxMessageLength = 200;
-#define CHAT_MAX_WINDOW_WIDTH 600
+constexpr uint8_t kChatMaxMessageLength = 200;
+constexpr int16_t kChatMaxWindowWidth = 600;
 
 struct DrawPixelInfo;
 struct ScreenCoordsXY;