diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 70739ca8bf44..956d9901bbf6 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -5563,7 +5563,7 @@ static void WindowRideMeasurementsPaint(rct_window* w, rct_drawpixelinfo* dpi)
                     int32_t numTimes = 0;
                     for (int32_t i = 0; i < ride->num_stations; i++)
                     {
-                        StationIndex stationIndex = StationIndex::FromUnderlying(i);
+                        StationIndex stationIndex = StationIndex::FromUnderlying(numTimes);
                         auto time = ride->GetStation(stationIndex).SegmentTime;
                         if (time != 0)
                         {
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index a63708af37a6..34c2a101b5cd 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -3609,6 +3609,7 @@ void Ride::MoveTrainsToBlockBrakes(TrackElement* firstBlock)
 static bool ride_initialise_cable_lift_track(Ride* ride, bool isApplying)
 {
     CoordsXYZ location;
+    location.SetNull();
     for (const auto& station : ride->GetStations())
     {
         location = station.GetStart();
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index ef8e5a8a5ac2..eff0c5378706 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -2365,7 +2365,7 @@ void Vehicle::UpdateWaitingToDepart()
     if (curRide == nullptr)
         return;
 
-    const auto& currentStation = curRide->GetStation(curRide->current_test_station);
+    const auto& currentStation = curRide->GetStation(current_station);
 
     bool shouldBreak = false;
     if (curRide->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)