Core/Unit: Fix some phasing change problems with vehicle