diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h
index 75b4e52168..451f207fa9 100644
--- a/src/openrct2/paint/Paint.h
+++ b/src/openrct2/paint/Paint.h
@@ -48,12 +48,12 @@ enum PAINT_QUADRANT_FLAGS
 
 struct paint_struct_bound_box
 {
-    uint16_t x;
-    uint16_t y;
-    uint16_t z;
-    uint16_t x_end;
-    uint16_t y_end;
-    uint16_t z_end;
+    int32_t x;
+    int32_t y;
+    int32_t z;
+    int32_t x_end;
+    int32_t y_end;
+    int32_t z_end;
 };
 
 struct paint_struct
diff --git a/src/openrct2/world/Entrance.h b/src/openrct2/world/Entrance.h
index 585871dd1c..efb61c80a8 100644
--- a/src/openrct2/world/Entrance.h
+++ b/src/openrct2/world/Entrance.h
@@ -36,7 +36,7 @@ constexpr const uint8_t RideExitHeight = 5 * COORDS_Z_STEP;
 extern bool gParkEntranceGhostExists;
 extern CoordsXYZD gParkEntranceGhostPosition;
 
-#define MAX_PARK_ENTRANCES 4
+#define MAX_PARK_ENTRANCES 256
 
 constexpr int32_t MaxRideEntranceOrExitHeight = 244 * COORDS_Z_STEP;
 
diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h
index c2fb176c1d..00a2325352 100644
--- a/src/openrct2/world/Map.h
+++ b/src/openrct2/world/Map.h
@@ -36,7 +36,7 @@ constexpr const int32_t MINIMUM_LAND_HEIGHT_BIG = MINIMUM_LAND_HEIGHT * COORDS_Z
 constexpr const uint32_t MAX_TILE_ELEMENTS_WITH_SPARE_ROOM = 0x1000000;
 constexpr const uint32_t MAX_TILE_ELEMENTS = MAX_TILE_ELEMENTS_WITH_SPARE_ROOM - 512;
 #define MAX_TILE_TILE_ELEMENT_POINTERS (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL)
-#define MAX_PEEP_SPAWNS 2
+#define MAX_PEEP_SPAWNS 256
 
 #define TILE_UNDEFINED_TILE_ELEMENT NULL