diff --git a/src/lang/english.txt b/src/lang/english.txt
index ccdbc5f649..aa277380a2 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -4486,7 +4486,7 @@ STR_ORDERS_STOP_SHARING_BUTTON                                  :{BLACK}Stop sha
 STR_ORDERS_STOP_SHARING_TOOLTIP                                 :{BLACK}Stop sharing the order list. Ctrl+Click additionally deletes all orders for this vehicle
 
 STR_ORDERS_AUTOMATIC_SEPARATION                                 :{BLACK}Automatic separation
-STR_ORDERS_AUTOMATIC_SEPARATION_TOOLTIP                         :{BLACK}Automatically separate all vehicles sharing this order
+STR_ORDERS_AUTOMATIC_SEPARATION_TOOLTIP                         :{BLACK}Automatically separate all vehicles sharing these orders
 
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Go To
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Go to nearest depot
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 3c5ae2376c..34aac8d954 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -1470,7 +1470,7 @@ static bool CheckAircraftOrderDistance(const Aircraft *v_new, const Vehicle *v_o
 /**
  * Enable or disable automatic separation for a vehicle's order list
  * @param flags operation to perform
- * @param veh vehicle who's order list is being modified
+ * @param veh vehicle whose order list is being modified
  * @param enabled value indicating whether to enable (true) or disable (false) automatic separation
  * @return the cost of this operation or an error
  */
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index 88660b335c..fae257a33e 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -331,7 +331,6 @@ enum SaveLoadVersion : uint16_t {
 	SLV_CUSTOM_SUBSIDY_DURATION,            ///< 292  PR#9081 Configurable subsidy duration.
 	SLV_SAVELOAD_LIST_LENGTH,               ///< 293  PR#9374 Consistency in list length with SL_STRUCT / SL_STRUCTLIST / SL_DEQUE / SL_REFLIST.
 	SLV_RIFF_TO_ARRAY,                      ///< 294  PR#9375 Changed many CH_RIFF chunks to CH_ARRAY chunks.
-	SLV_AUTOMATIC_SEPARATION,               ///< 295  PR#8342 Allow automatically separating vehicles in shared orders.
 
 	SLV_TABLE_CHUNKS,                       ///< 295  PR#9322 Introduction of CH_TABLE and CH_SPARSE_TABLE.
 	SLV_SCRIPT_INT64,                       ///< 296  PR#9415 SQInteger is 64bit but was saved as 32bit.
@@ -367,6 +366,7 @@ enum SaveLoadVersion : uint16_t {
 	SLV_TIMETABLE_START_TICKS,              ///< 321  PR#11468 Convert timetable start from a date to ticks.
 	SLV_TIMETABLE_START_TICKS_FIX,          ///< 322  PR#11557 Fix for missing convert timetable start from a date to ticks.
 	SLV_TIMETABLE_TICKS_TYPE,               ///< 323  PR#11435 Convert timetable current order time to ticks.
+	SLV_AUTOMATIC_SEPARATION,               ///< 324  PR#8342 Allow automatically separating vehicles in shared orders.
 
 	SL_MAX_VERSION,                         ///< Highest possible saveload version
 };
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 6f33f4f41e..a29147a007 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2371,7 +2371,7 @@ void Vehicle::HandleLoading(bool mode)
  * it is ready to depart)
  */
 bool Vehicle::IsWaitingForAutomaticSeparation() const {
-	TimerGameTick::Ticks now = TimerGameCalendar::date.base() * Ticks::DAY_TICKS + TimerGameCalendar::date_fract;
+	TimerGameTick::Ticks now = (TimerGameCalendar::date.base() * Ticks::DAY_TICKS) + TimerGameCalendar::date_fract;
 	return this->AutomaticSeparationIsEnabled() && this->first_order_last_departure > now;
 };
 
@@ -2421,7 +2421,7 @@ void Vehicle::UpdateAutomaticSeparation()
 		/* A stopped vehicle is not included; it might be stopped by player or parked in a depot */
 		if (!(v->vehstatus & VS_STOPPED)) {
 			vehicles++;
-			/* Count vehicles queing for the first manual order but not currently in the station */
+			/* Count vehicles queuing for the first manual order but not currently in the station */
 			if (v != this && v->cur_speed == 0 && v->cur_implicit_order_index == first_manual_order && !v->current_order.IsType(OT_LOADING)) {
 				vehicles_queuing++;
 			}