Vehicles configuration fixes