Fixes for the vehicle issue after the so-called tent fix.