diff --git a/src/paint/map_element/fence.c b/src/paint/map_element/fence.c
index c38bdfefaa..447cc80a7b 100644
--- a/src/paint/map_element/fence.c
+++ b/src/paint/map_element/fence.c
@@ -104,10 +104,10 @@ void fence_paint_wall(uint32 frameNum, const rct_scenery_entry * sceneryEntry, u
             imageId = (imageId & 0x7FFFF) | dword_141F710;
         }
 
-        sub_98197C(imageId, offset.x, offset.y, bounds.x, bounds.y, bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
+        sub_98197C(imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, (sint8)bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
         if (dword_141F710 == 0) {
             imageId = baseImageId + dword_141F718;
-            sub_98199C(imageId, offset.x, offset.y, bounds.x, bounds.y, bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
+            sub_98199C(imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, (sint8)bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
         }
     } else {
         if (sceneryEntry->wall.flags & WALL_SCENERY_FLAG1) {
@@ -118,7 +118,7 @@ void fence_paint_wall(uint32 frameNum, const rct_scenery_entry * sceneryEntry, u
             imageId = (imageId & 0x7FFFF) | dword_141F710;
         }
 
-        paint_struct * paint = sub_98197C(imageId, offset.x, offset.y, bounds.x, bounds.y, bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
+        paint_struct * paint = sub_98197C(imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, (sint8)bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
         if (paint != NULL) {
             paint->tertiary_colour = tertiaryColour;
         }
diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c
index 019f967de0..6ba96c2be3 100644
--- a/src/ride/track_paint.c
+++ b/src/ride/track_paint.c
@@ -253,18 +253,18 @@ bool track_paint_util_draw_station_covers(enum edge edge, bool hasFence, const r
 
 	if (baseImageId & 0x40000000) {
 		imageId = (baseImageId & 0xBFFFFFFF) + imageOffset;
-		sub_98197C(imageId, offset.x, offset.y, bounds.x, bounds.y, bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
+		sub_98197C(imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, (sint8)bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
 
 		uint32 edi = RCT2_GLOBAL(0x00F44198, uint32) & (0b11111 << 19);
 
 		// weird jump
 		imageId = (baseImageId | edi) + 0x3800000 + imageOffset + 12;
-		sub_98199C(imageId, offset.x, offset.y, bounds.x, bounds.y, bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
+		sub_98199C(imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, (sint8)bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
 		return true;
 	}
 
 	imageId = (baseImageId + imageOffset) | RCT2_GLOBAL(0x00F44198, uint32);
-	sub_98197C(imageId, offset.x, offset.y, bounds.x, bounds.y, bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
+	sub_98197C(imageId, (sint8)offset.x, (sint8)offset.y, bounds.x, bounds.y, (sint8)bounds.z, offset.z, boundsOffset.x, boundsOffset.y, boundsOffset.z, get_current_rotation());
 	return true;
 }
 
diff --git a/src/ride/water/submarine_ride.c b/src/ride/water/submarine_ride.c
index 6f61c671a8..fb243a349c 100644
--- a/src/ride/water/submarine_ride.c
+++ b/src/ride/water/submarine_ride.c
@@ -340,7 +340,7 @@ uint8 right_quarter_turn_3_tiles_to_left_turn_map[] = {3, 1, 2, 0};
 static void submarine_ride_paint_track_right_quarter_turn_3_tiles(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
 {
 	trackSequence = right_quarter_turn_3_tiles_to_left_turn_map[trackSequence];
-	return submarine_ride_paint_track_left_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement);
+	submarine_ride_paint_track_left_quarter_turn_3_tiles(rideIndex, trackSequence, (direction + 3) % 4, height, mapElement);
 }
 
 static void submarine_ride_paint_track_left_quarter_turn_1_tile(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)