diff --git a/src/tbtr_template_vehicle_func.cpp b/src/tbtr_template_vehicle_func.cpp
index 3c5ead2592..3f149e0f96 100644
--- a/src/tbtr_template_vehicle_func.cpp
+++ b/src/tbtr_template_vehicle_func.cpp
@@ -109,7 +109,7 @@ Money CalculateOverallTemplateCost(const TemplateVehicle *tv)
 {
 	Money val = 0;
 
-	for (; tv; tv = tv->Next()) {
+	for (; tv; tv = tv->GetNextUnit()) {
 		val += (Engine::Get(tv->engine_type))->GetCost();
 	}
 	return val;
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index e4e55d9924..2743e17e45 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -3364,7 +3364,7 @@ static Vehicle *FindTrainCollideEnum(Vehicle *v, void *data)
 
 	/* Slower check using multiplication */
 	int min_diff = (Train::From(v)->gcache.cached_veh_length + 1) / 2 + (tcc->v->gcache.cached_veh_length + 1) / 2 - 1;
-	if (x_diff * x_diff + y_diff * y_diff > min_diff * min_diff) return NULL;
+	if (x_diff * x_diff + y_diff * y_diff >= min_diff * min_diff) return NULL;
 
 	/* Happens when there is a train under bridge next to bridge head */
 	if (abs(v->z_pos - tcc->v->z_pos) > 5) return NULL;