Updates and fixes to arriving/departure.