fixes for vehicle assignment