diff --git a/src/economy.cpp b/src/economy.cpp
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1314,7 +1314,7 @@ static void LoadUnloadVehicle(Vehicle *v
 		/* update stats */
 		int t;
 		switch (u->type) {
-			case VEH_TRAIN: t = ((Train *)u)->tcache.cached_max_speed; break;
+			case VEH_TRAIN: t = Train::From(u)->tcache.cached_max_speed; break;
 			case VEH_ROAD:  t = u->max_speed / 2;           break;
 			default:        t = u->max_speed;               break;
 		}
@@ -1423,7 +1423,7 @@ static void LoadUnloadVehicle(Vehicle *v
 
 	if (v->type == VEH_TRAIN) {
 		/* Each platform tile is worth 2 rail vehicles. */
-		int overhang = ((Train *)v)->tcache.cached_total_length - st->GetPlatformLength(v->tile) * TILE_SIZE;
+		int overhang = Train::From(v)->tcache.cached_total_length - st->GetPlatformLength(v->tile) * TILE_SIZE;
 		if (overhang > 0) {
 			unloading_time <<= 1;
 			unloading_time += (overhang * unloading_time) / 8;