diff --git a/src/interface/viewport.c b/src/interface/viewport.c
index 6b0f164554..0bd043a95d 100644
--- a/src/interface/viewport.c
+++ b/src/interface/viewport.c
@@ -760,7 +760,7 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
 			}
 			gfx_clear(dpi2, colour);
 		}
-		g_ps_EE7880 = (paint_struct *)0xF1A4CC;
+		g_ps_EE7880 = RCT2_ADDRESS(0xF1A4CC, paint_struct);
 		unk_140E9A8 = dpi2;
 		painter_setup();
 		viewport_paint_setup();
@@ -1392,7 +1392,7 @@ void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x
 			dpi->zoom_level = RCT2_GLOBAL(RCT2_ADDRESS_VIEWPORT_ZOOM, uint16_t);
 			dpi->x = RCT2_GLOBAL(RCT2_ADDRESS_VIEWPORT_PAINT_X, int16_t);
 			dpi->width = 1;
-			g_ps_EE7880 = (paint_struct *)0xF1A4CC;
+			g_ps_EE7880 = RCT2_ADDRESS(0xF1A4CC, paint_struct);
 			unk_140E9A8 = dpi;
 			painter_setup();
 			viewport_paint_setup();
diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c
index 5398869a7b..6388630bed 100644
--- a/src/windows/ride_construction.c
+++ b/src/windows/ride_construction.c
@@ -2304,7 +2304,7 @@ static void sub_6CBCE2(
 	gCurrentViewportFlags = 0;
 	trackDirection &= 3;
 
-	g_ps_EE7880 = (paint_struct *)0x00F1A4CC;
+	g_ps_EE7880 = RCT2_ADDRESS(0xF1A4CC, paint_struct);
 	painter_setup();
 
 	ride = get_ride(rideIndex);