vehicle, datadispatcher fixes