diff --git a/src/ride/station.c b/src/ride/station.c
index 5b3f7e159f..225788c4bf 100644
--- a/src/ride/station.c
+++ b/src/ride/station.c
@@ -66,7 +66,7 @@ static void ride_update_station_blocksection(rct_ride *ride, int stationIndex)
 	if ((ride->status == RIDE_STATUS_CLOSED && ride->num_riders == 0) || (mapElement != NULL && mapElement->flags & 0x20)) {
 		ride->station_depart[stationIndex] &= ~STATION_DEPART_FLAG;
 
-		if ((ride->station_depart[stationIndex] & STATION_DEPART_FLAG) || (mapElement->properties.track.sequence & 0x80))
+		if ((ride->station_depart[stationIndex] & STATION_DEPART_FLAG) || (mapElement != NULL && (mapElement->properties.track.sequence & 0x80)))
 			ride_invalidate_station_start(ride, stationIndex, 0);
 	} else {
 		if (!(ride->station_depart[stationIndex] & STATION_DEPART_FLAG)) {
diff --git a/src/ride/thrill/motion_simulator.c b/src/ride/thrill/motion_simulator.c
index ec094ae8f8..906f2748c9 100644
--- a/src/ride/thrill/motion_simulator.c
+++ b/src/ride/thrill/motion_simulator.c
@@ -62,7 +62,7 @@ static void paint_motionsimulator_vehicle(sint8 offsetX, sint8 offsetY, uint8 di
 
 	uint32 imageColourFlags = RCT2_GLOBAL(0x00F441A0, uint32);
 	if (imageColourFlags == 0x20000000) {
-		imageColourFlags = (IMAGE_TYPE_UNKNOWN | IMAGE_TYPE_USE_PALETTE) << 28;
+		imageColourFlags = (uint32)(IMAGE_TYPE_UNKNOWN | IMAGE_TYPE_USE_PALETTE) << 28;
 		imageColourFlags |= ride->vehicle_colours[0].trim_colour << 19;
 		imageColourFlags |= ride->vehicle_colours[0].body_colour << 24;
 	}
diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c
index 8e6d20c3cd..f3bbc3cc60 100644
--- a/src/ride/track_paint.c
+++ b/src/ride/track_paint.c
@@ -836,8 +836,8 @@ void track_paint_util_spinning_tunnel_paint(sint8 thickness, sint16 height, uint
 	uint32 colourFlags = RCT2_GLOBAL(0x00F4419C, uint32);
 
 	uint32 colourFlags2 = RCT2_GLOBAL(0x00F44198, uint32);
-	if (colourFlags2 & (IMAGE_TYPE_UNKNOWN << 28)) {
-		colourFlags |= colourFlags2 & (IMAGE_TYPE_UNKNOWN << 28 | 0x1F << 24);
+	if (colourFlags2 & ((uint32)IMAGE_TYPE_UNKNOWN << 28)) {
+		colourFlags |= colourFlags2 & ((uint32)IMAGE_TYPE_UNKNOWN << 28 | 0x1F << 24);
 	}
 
 	uint32 imageId = trackSpritesGhostTrainSpinningTunnel[direction & 1][0][frame] | colourFlags;