More "timeLeft" fixes for shipments